From ca7febe877cf8d88a7e6a4a5be56ca8b6e3d3f54 Mon Sep 17 00:00:00 2001 From: NicoVIII Date: Tue, 7 Jun 2022 15:26:16 +0000 Subject: [PATCH] Update dependencies --- paket.dependencies | 24 +- paket.lock | 658 ++---------------- .../AvaloniaApp/Components/Authentication.fs | 10 +- .../AvaloniaApp/Components/InstallGame.fs | 6 +- .../AvaloniaApp/Components/Settings.fs | 4 +- src/Andromeda/AvaloniaApp/Program.fs | 5 +- src/Andromeda/AvaloniaApp/View.fs | 2 +- src/Andromeda/AvaloniaApp/paket.references | 2 +- src/Andromeda/Core/Diverse.fs | 2 +- src/Andromeda/Core/paket.references | 3 +- 10 files changed, 107 insertions(+), 609 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index edbcc91..971fbf1 100644 --- 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 index 9a8eeeb..79424fc 100644 --- a/paket.lock +++ b/paket.lock @@ -2,8 +2,8 @@ STORAGE: NONE RESTRICTION: == net6.0 NUGET remote: https://api.nuget.org/v3/index.json - Avalonia (0.10.10) - Avalonia.Remote.Protocol (>= 0.10.10) + Avalonia (0.10.15) + Avalonia.Remote.Protocol (>= 0.10.15) JetBrains.Annotations (>= 10.3) System.ComponentModel.Annotations (>= 4.5) System.Memory (>= 4.5.3) @@ -16,38 +16,40 @@ NUGET Avalonia.Remote.Protocol (>= 0.10.10) JetBrains.Annotations (>= 10.3) System.Reactive (>= 5.0) - Avalonia.Desktop (0.10.10) - Avalonia (>= 0.10.10) - Avalonia.Native (>= 0.10.10) - Avalonia.Skia (>= 0.10.10) - Avalonia.Win32 (>= 0.10.10) - Avalonia.X11 (>= 0.10.10) + Avalonia.Desktop (0.10.15) + Avalonia (>= 0.10.15) + Avalonia.Native (>= 0.10.15) + Avalonia.Skia (>= 0.10.15) + Avalonia.Win32 (>= 0.10.15) + Avalonia.X11 (>= 0.10.15) Avalonia.Diagnostics (0.10.10) Avalonia (>= 0.10.10) Avalonia.Controls.DataGrid (>= 0.10.10) Microsoft.CodeAnalysis.CSharp.Scripting (>= 3.4) System.Reactive (>= 5.0) - Avalonia.FreeDesktop (0.10.10) - Avalonia (>= 0.10.10) + Avalonia.FreeDesktop (0.10.15) + Avalonia (>= 0.10.15) Tmds.DBus (>= 0.9) - Avalonia.Native (0.10.10) - Avalonia (>= 0.10.10) - Avalonia.Remote.Protocol (0.10.12) - Avalonia.Skia (0.10.10) - Avalonia (>= 0.10.10) - HarfBuzzSharp (>= 2.6.1.7) - HarfBuzzSharp.NativeAssets.Linux (>= 2.6.1.7) - SkiaSharp (>= 2.80.2) - SkiaSharp.NativeAssets.Linux (>= 2.80.2) - Avalonia.Win32 (0.10.10) - Avalonia (>= 0.10.10) + Avalonia.Native (0.10.15) + Avalonia (>= 0.10.15) + Avalonia.Remote.Protocol (0.10.15) + Avalonia.Skia (0.10.15) + Avalonia (>= 0.10.15) + HarfBuzzSharp (>= 2.8.2-preview.178) + HarfBuzzSharp.NativeAssets.Linux (>= 2.8.2-preview.178) + HarfBuzzSharp.NativeAssets.WebAssembly (>= 2.8.2-preview.178) + SkiaSharp (>= 2.88.1-preview.1) + SkiaSharp.NativeAssets.Linux (>= 2.88.1-preview.1) + SkiaSharp.NativeAssets.WebAssembly (>= 2.88.1-preview.1) + Avalonia.Win32 (0.10.15) + Avalonia (>= 0.10.15) Avalonia.Angle.Windows.Natives (>= 2.1.0.2020091801) System.Drawing.Common (>= 4.5) System.Numerics.Vectors (>= 4.5) - Avalonia.X11 (0.10.10) - Avalonia (>= 0.10.10) - Avalonia.FreeDesktop (>= 0.10.10) - Avalonia.Skia (>= 0.10.10) + Avalonia.X11 (0.10.15) + Avalonia (>= 0.10.15) + Avalonia.FreeDesktop (>= 0.10.15) + Avalonia.Skia (>= 0.10.15) Elmish (3.1) FSharp.Core (>= 4.6.2) Expecto (9.0.4) @@ -56,605 +58,97 @@ NUGET Expecto.FsCheck (9.0.4) Expecto (>= 9.0.4) FsCheck (>= 2.14.3) - FsAst (0.10) - FSharp.Compiler.Service (>= 39.0) - FsCheck (2.16.4) + FsCheck (2.16.5) FSharp.Core (>= 4.2.3) - FSharp.Compiler.Service (41.0.2) - FSharp.Core (6.0.2) - Microsoft.Build.Framework (>= 17.0.0-preview-21515-03) - Microsoft.Build.Tasks.Core (>= 17.0.0-preview-21515-03) - Microsoft.Build.Utilities.Core (>= 17.0.0-preview-21515-03) - System.Buffers (>= 4.5.1) - System.Collections.Immutable (>= 5.0) - System.Diagnostics.Process (>= 4.3) - System.Diagnostics.TraceSource (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.Linq.Queryable (>= 4.3) - System.Memory (>= 4.5.4) - System.Net.Requests (>= 4.3) - System.Net.Security (>= 4.3.1) - System.Reflection.Emit (>= 4.3) - System.Reflection.Metadata (>= 5.0) - System.Reflection.TypeExtensions (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Loader (>= 4.3) - System.Security.Claims (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Principal (>= 4.3) - System.Threading.Tasks.Parallel (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - FSharp.Core (6.0.2) - content: none + FSharp.Core (6.0.4) - content: none FSharp.Data (4.2.8) FSharp.Core (>= 4.7.2) FSharp.Json (0.4.1) FSharp.Core (>= 4.6.2) - FsHttp (7.0) + FsHttp (6.0.1) FSharp.Core (>= 5.0) FSharp.Data (>= 4.0.1) FsToolkit.ErrorHandling (2.13) FSharp.Core (>= 4.7.2) - HarfBuzzSharp (2.6.1.8) + HarfBuzzSharp (2.8.2) + HarfBuzzSharp.NativeAssets.macOS (>= 2.8.2) + HarfBuzzSharp.NativeAssets.Win32 (>= 2.8.2) System.Memory (>= 4.5.3) - HarfBuzzSharp.NativeAssets.Linux (2.6.1.8) - HarfBuzzSharp (>= 2.6.1.8) - JaggerJo.Avalonia.FuncUI (0.5.0-beta) - Avalonia.Desktop (>= 0.10.0-rc1) - FSharp.Core (>= 4.7.2) - JaggerJo.Avalonia.FuncUI.DSL (0.5.0-beta) - Avalonia.Desktop (>= 0.10.0-rc1) - FSharp.Core (>= 4.7.2) - JaggerJo.Avalonia.FuncUI (>= 0.5.0-beta) - JaggerJo.Avalonia.FuncUI.Elmish (0.5.0-beta) - Avalonia.Desktop (>= 0.10.0-rc1) + HarfBuzzSharp.NativeAssets.Linux (2.8.2) + HarfBuzzSharp (>= 2.8.2) + HarfBuzzSharp.NativeAssets.macOS (2.8.2) + HarfBuzzSharp.NativeAssets.WebAssembly (2.8.2.1-preview.1) + HarfBuzzSharp.NativeAssets.Win32 (2.8.2) + 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 (>= 4.7.2) - JaggerJo.Avalonia.FuncUI (>= 0.5.0-beta) - JetBrains.Annotations (2021.3) + FSharp.Core (>= 6.0.4) + JaggerJo.Avalonia.FuncUI (>= 0.5.3) + JetBrains.Annotations (2022.1) MessageBox.Avalonia (1.7.1) Avalonia (>= 0.10.8) - Microsoft.Build.Framework (17.0) - System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (17.0) - Microsoft.Build.Framework (>= 17.0) - Microsoft.Build.Utilities.Core (>= 17.0) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.CodeDom (>= 4.4) - System.Collections.Immutable (>= 5.0) - System.Reflection.Metadata (>= 1.6) - System.Resources.Extensions (>= 4.6) - System.Security.Cryptography.Pkcs (>= 4.7) - System.Security.Cryptography.Xml (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Utilities.Core (17.0) - Microsoft.Build.Framework (>= 17.0) - Microsoft.NET.StringTools (>= 1.0) - Microsoft.Win32.Registry (>= 4.3) - System.Collections.Immutable (>= 5.0) - System.Configuration.ConfigurationManager (>= 4.7) - System.Security.Permissions (>= 4.7) - System.Text.Encoding.CodePages (>= 4.0.1) Microsoft.CodeAnalysis.Analyzers (3.3.3) - Microsoft.CodeAnalysis.Common (4.1) + Microsoft.CodeAnalysis.Common (4.2) Microsoft.CodeAnalysis.Analyzers (>= 3.3.3) System.Collections.Immutable (>= 5.0) System.Memory (>= 4.5.4) System.Reflection.Metadata (>= 5.0) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - System.Text.Encoding.CodePages (>= 4.5.1) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Text.Encoding.CodePages (>= 6.0) System.Threading.Tasks.Extensions (>= 4.5.4) - Microsoft.CodeAnalysis.CSharp (4.1) - Microsoft.CodeAnalysis.Common (4.1) - Microsoft.CodeAnalysis.CSharp.Scripting (4.1) - Microsoft.CodeAnalysis.Common (4.1) - Microsoft.CodeAnalysis.CSharp (4.1) - Microsoft.CodeAnalysis.Scripting.Common (4.1) + Microsoft.CodeAnalysis.CSharp (4.2) + Microsoft.CodeAnalysis.Common (4.2) + Microsoft.CodeAnalysis.CSharp.Scripting (4.2) + Microsoft.CodeAnalysis.Common (4.2) + Microsoft.CodeAnalysis.CSharp (4.2) + Microsoft.CodeAnalysis.Scripting.Common (4.2) Microsoft.CSharp (>= 4.7) - Microsoft.CodeAnalysis.Scripting.Common (4.1) - Microsoft.CodeAnalysis.Common (4.1) + Microsoft.CodeAnalysis.Scripting.Common (4.2) + Microsoft.CodeAnalysis.Common (4.2) Microsoft.CSharp (4.7) - Microsoft.NET.StringTools (1.0) - System.Memory (>= 4.5.4) - System.Runtime.CompilerServices.Unsafe (>= 5.0) - Microsoft.NETCore.Platforms (6.0.1) - Microsoft.NETCore.Targets (5.0) - Microsoft.Win32.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - Microsoft.Win32.Registry (5.0) - System.Security.AccessControl (>= 5.0) - System.Security.Principal.Windows (>= 5.0) - Microsoft.Win32.SystemEvents (6.0) + Microsoft.Win32.SystemEvents (6.0.1) Mono.Cecil (0.11.4) Mono.Posix.NETStandard (1.0) - Myriad.Core (0.4.1) - FsAst (>= 0.6) - FSharp.Compiler.Service (>= 36.0.3) - FSharp.Core (>= 4.7.2) - Myriad.Plugins (0.4.1) - FsAst (>= 0.6) - FSharp.Compiler.Service (>= 36.0.3) - FSharp.Core (>= 4.7.2) - Myriad.Core (>= 0.4.1) - Myriad.Sdk (0.4.1) - NicoVIII.FSharp.Json (0.6) + NicoVIII.FSharp.Json (0.5) FSharp.Core (>= 4.3.4) - NicoVIII.GogApi (3.0) - FsHttp (>= 6.0.1) - NicoVIII.FSharp.Json (>= 0.5) - NicoVIII.SimpleOptics (0.2) + NicoVIII.GogApi (3.0.1) + FsHttp (>= 6.0.1 < 7.0) + NicoVIII.FSharp.Json (>= 0.5 < 0.6) + NicoVIII.SimpleOptics (0.3.2) FSharp.Core (>= 6.0) - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.native.System (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Net.Http (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Net.Security (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - runtime.native.System.Security.Cryptography.Apple (4.3.1) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) - runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) - runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3.1) - runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) SharpZipLib (1.3.3) - SkiaSharp (2.80.3) + SkiaSharp (2.88.1-preview.1) + SkiaSharp.NativeAssets.macOS (>= 2.88.1-preview.1) + SkiaSharp.NativeAssets.Win32 (>= 2.88.1-preview.1) System.Memory (>= 4.5.3) - SkiaSharp.NativeAssets.Linux (2.80.3) - SkiaSharp (>= 2.80.3) - System.Buffers (4.5.1) - System.CodeDom (6.0) - System.Collections (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Collections.Concurrent (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) + SkiaSharp.NativeAssets.Linux (2.88.1-preview.1) + SkiaSharp (>= 2.88.1-preview.1) + SkiaSharp.NativeAssets.macOS (2.88.1-preview.1) + SkiaSharp.NativeAssets.WebAssembly (2.88.1-preview.1) + SkiaSharp.NativeAssets.Win32 (2.88.1-preview.1) System.Collections.Immutable (6.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) System.ComponentModel.Annotations (5.0) - System.Configuration.ConfigurationManager (6.0) - System.Security.Cryptography.ProtectedData (>= 6.0) - System.Security.Permissions (>= 6.0) - System.Diagnostics.Debug (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Diagnostics.DiagnosticSource (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Diagnostics.Process (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - Microsoft.Win32.Registry (>= 4.3) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Text.Encoding.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Diagnostics.TraceSource (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Diagnostics.Tracing (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Drawing.Common (6.0) Microsoft.Win32.SystemEvents (>= 6.0) - System.Formats.Asn1 (6.0) - System.Globalization (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Globalization.Calendars (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Runtime (>= 4.3) - System.Globalization.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.IO (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.IO.FileSystem.Primitives (4.3) - System.Runtime (>= 4.3) - System.Linq (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Linq.Expressions (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Linq (>= 4.3) - System.ObjectModel (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 4.3) - System.Reflection.Emit.Lightweight (>= 4.3) - System.Reflection.Extensions (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Reflection.TypeExtensions (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Linq.Queryable (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Linq (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Extensions (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Memory (4.5.4) - System.Net.Http (4.3.4) - Microsoft.NETCore.Platforms (>= 1.1.1) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Http (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.DiagnosticSource (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Extensions (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Security.Cryptography.X509Certificates (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Net.Primitives (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (>= 4.3) - System.Net.Requests (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Net.Http (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Net.WebHeaderCollection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Net.Security (4.3.2) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.Win32.Primitives (>= 4.3) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Security (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Collections.Concurrent (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Extensions (>= 4.3) - System.IO (>= 4.3) - System.Net.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Claims (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Security.Cryptography.X509Certificates (>= 4.3) - System.Security.Principal (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.ThreadPool (>= 4.3) - System.Net.WebHeaderCollection (4.3) - System.Collections (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) + System.Memory (4.5.5) System.Numerics.Vectors (4.5) - System.ObjectModel (4.3) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) System.Reactive (5.0) - System.Reflection (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.IO (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) System.Reflection.Emit (4.7) - System.Reflection.Emit.ILGeneration (4.7) - System.Reflection.Emit.Lightweight (4.7) - System.Reflection.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Reflection.Metadata (6.0) + System.Reflection.Metadata (6.0.1) System.Collections.Immutable (>= 6.0) - System.Reflection.Primitives (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Reflection.TypeExtensions (4.7) - System.Resources.Extensions (6.0) - System.Resources.ResourceManager (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Globalization (>= 4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) System.Runtime.CompilerServices.Unsafe (6.0) - System.Runtime.Extensions (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1.1) - Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime (>= 4.3.1) - System.Runtime.Handles (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Runtime.InteropServices (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Reflection (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.Loader (4.3) - System.IO (>= 4.3) - System.Reflection (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Numerics (4.3) - System.Globalization (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Security.AccessControl (6.0) - System.Security.Claims (4.3) - System.Collections (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Security.Principal (>= 4.3) - System.Security.Cryptography.Algorithms (4.3.1) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Numerics (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Security.Cryptography.Cng (5.0) - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Csp (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - System.IO (>= 4.3) - System.Reflection (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Security.Cryptography.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) - System.Collections (>= 4.3) - System.Collections.Concurrent (>= 4.3) - System.Linq (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (5.0) - System.Formats.Asn1 (>= 5.0) - System.Security.Cryptography.Pkcs (6.0) - System.Formats.Asn1 (>= 6.0) - System.Security.Cryptography.Primitives (4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.IO (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Security.Cryptography.ProtectedData (6.0) - System.Security.Cryptography.X509Certificates (4.3.2) - Microsoft.NETCore.Platforms (>= 1.1) - runtime.native.System (>= 4.3) - runtime.native.System.Net.Http (>= 4.3) - runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) - System.Collections (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Globalization (>= 4.3) - System.Globalization.Calendars (>= 4.3) - System.IO (>= 4.3) - System.IO.FileSystem (>= 4.3) - System.IO.FileSystem.Primitives (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Runtime.Handles (>= 4.3) - System.Runtime.InteropServices (>= 4.3) - System.Runtime.Numerics (>= 4.3) - System.Security.Cryptography.Algorithms (>= 4.3) - System.Security.Cryptography.Cng (>= 4.3) - System.Security.Cryptography.Csp (>= 4.3) - System.Security.Cryptography.Encoding (>= 4.3) - System.Security.Cryptography.OpenSsl (>= 4.3) - System.Security.Cryptography.Primitives (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (>= 4.3) - System.Security.Cryptography.Xml (6.0) - System.Security.AccessControl (>= 6.0) - System.Security.Cryptography.Pkcs (>= 6.0) - System.Security.Permissions (6.0) - System.Security.AccessControl (>= 6.0) - System.Windows.Extensions (>= 6.0) - System.Security.Principal (4.3) - System.Runtime (>= 4.3) System.Security.Principal.Windows (5.0) - System.Text.Encoding (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) System.Text.Encoding.CodePages (6.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encoding.Extensions (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Text.Encoding (>= 4.3) - System.Threading (4.3) - System.Runtime (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Tasks (4.3) - Microsoft.NETCore.Platforms (>= 1.1) - Microsoft.NETCore.Targets (>= 1.1) - System.Runtime (>= 4.3) - System.Threading.Tasks.Dataflow (6.0) System.Threading.Tasks.Extensions (4.5.4) - System.Threading.Tasks.Parallel (4.3) - System.Collections.Concurrent (>= 4.3) - System.Diagnostics.Debug (>= 4.3) - System.Diagnostics.Tracing (>= 4.3) - System.Resources.ResourceManager (>= 4.3) - System.Runtime (>= 4.3) - System.Runtime.Extensions (>= 4.3) - System.Threading (>= 4.3) - System.Threading.Tasks (>= 4.3) - System.Threading.Thread (4.3) - System.Runtime (>= 4.3) - System.Threading.ThreadPool (4.3) - System.Runtime (>= 4.3) - System.Runtime.Handles (>= 4.3) System.ValueTuple (4.5) - System.Windows.Extensions (6.0) - System.Drawing.Common (>= 6.0) Tmds.DBus (0.10.1) System.Reflection.Emit (>= 4.7) System.Security.Principal.Windows (>= 4.7) diff --git a/src/Andromeda/AvaloniaApp/Components/Authentication.fs b/src/Andromeda/AvaloniaApp/Components/Authentication.fs index 2ce149c..6e7ffe6 100644 --- 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 index fd1f7ea..79b5096 100644 --- 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 index 74d852b..390a5f6 100644 --- 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 index 66753d9..6250684 100644 --- 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 index dbc19cf..0b38971 100644 --- 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 index 58834bb..95a6df3 100644 --- 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 index 4d939e0..f122c9b 100644 --- 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 = } [] - /// 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 index 0dce716..5ceb7ca 100644 --- 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