diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
index cbaf34f2..9371f950 100644
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@@ -216,10 +216,10 @@
- 2.0.3
+ 3.1.8
- 2.0.3
+ 3.1.8
2.0.0.3
@@ -228,19 +228,19 @@
1.60.0
- 2.80.1
+ 2.80.2
- 2.80.1
+ 2.80.2
- 1.6.292
+ 1.7.335
- 1.1.14
+ 2.0.4
- 1.1.14
+ 2.0.4
1.1.14
@@ -255,10 +255,10 @@
1.5.3.2
- 4.8.0.1364
+ 4.8.0.1451
- 4.8.0.1364
+ 4.8.0.1451
1.0.0
diff --git a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
index 2ea50f88..270ee533 100644
--- a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
+++ b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
@@ -111,61 +111,64 @@
..\..\packages\Markdig.0.21.1\lib\net452\Markdig.dll
- ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\..\packages\Microsoft.Data.Sqlite.Core.2.0.1\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
+
+ ..\..\packages\Microsoft.Bcl.HashCode.1.1.0\lib\net461\Microsoft.Bcl.HashCode.dll
-
- ..\..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
+
+ ..\..\packages\Microsoft.Data.Sqlite.Core.3.1.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll
+
+ ..\..\packages\Microsoft.DotNet.PlatformAbstractions.3.1.6\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.2.2.6\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.Relational.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll
-
- ..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll
-
- ..\..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll
+
+ ..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.Configuration.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll
+
+ ..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll
-
- ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll
+
+ ..\..\packages\Microsoft.Extensions.Configuration.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll
-
- ..\..\packages\Microsoft.Extensions.Configuration.Binder.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll
+
+ ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll
+
+ ..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll
-
- ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+ ..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.8\lib\net461\Microsoft.Extensions.DependencyInjection.dll
-
- ..\..\packages\Microsoft.Extensions.DependencyModel.2.1.0\lib\net451\Microsoft.Extensions.DependencyModel.dll
+
+ ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.Logging.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.dll
+
+ ..\..\packages\Microsoft.Extensions.DependencyModel.3.1.6\lib\net451\Microsoft.Extensions.DependencyModel.dll
-
- ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
+
+ ..\..\packages\Microsoft.Extensions.Logging.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Logging.dll
-
- ..\..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+ ..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
+
+ ..\..\packages\Microsoft.Extensions.Options.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+
+ ..\..\packages\Microsoft.Extensions.Primitives.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -180,41 +183,44 @@
False
..\..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\pango-sharp.dll
-
- ..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll
+
+ ..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll
..\..\packages\Rg.Plugins.Popup.2.0.0.3\lib\net472\Rg.Plugins.Popup.dll
- ..\..\packages\SkiaSharp.2.80.1\lib\net462\SkiaSharp.dll
+ ..\..\packages\SkiaSharp.2.80.2\lib\net462\SkiaSharp.dll
- ..\..\packages\SkiaSharp.Views.2.80.1\lib\net462\SkiaSharp.Views.Desktop.dll
+ ..\..\packages\SkiaSharp.Views.2.80.2\lib\net462\SkiaSharp.Views.Desktop.dll
- ..\..\packages\SkiaSharp.Views.Desktop.Common.2.80.1\lib\net462\SkiaSharp.Views.Desktop.Common.dll
+ ..\..\packages\SkiaSharp.Views.Desktop.Common.2.80.2\lib\net462\SkiaSharp.Views.Desktop.Common.dll
- ..\..\packages\SkiaSharp.Views.Gtk2.2.80.1\lib\net462\SkiaSharp.Views.Gtk.dll
+ ..\..\packages\SkiaSharp.Views.Gtk2.2.80.2\lib\net462\SkiaSharp.Views.Gtk.dll
- ..\..\packages\SkiaSharp.Views.WindowsForms.2.80.1\lib\net462\SkiaSharp.Views.WindowsForms.dll
+ ..\..\packages\SkiaSharp.Views.WindowsForms.2.80.2\lib\net462\SkiaSharp.Views.WindowsForms.dll
- ..\..\packages\SkiaSharp.Views.WPF.2.80.1\lib\net462\SkiaSharp.Views.WPF.dll
+ ..\..\packages\SkiaSharp.Views.WPF.2.80.2\lib\net462\SkiaSharp.Views.WPF.dll
-
- ..\..\packages\sqlite-net-pcl.1.6.292\lib\netstandard1.1\SQLite-net.dll
+
+ ..\..\packages\sqlite-net-pcl.1.7.335\lib\netstandard2.0\SQLite-net.dll
-
- ..\..\packages\SQLitePCLRaw.bundle_green.1.1.14\lib\net45\SQLitePCLRaw.batteries_green.dll
+
+ ..\..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
-
- ..\..\packages\SQLitePCLRaw.bundle_green.1.1.14\lib\net45\SQLitePCLRaw.batteries_v2.dll
+
+ ..\..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
-
- ..\..\packages\SQLitePCLRaw.core.1.1.14\lib\net45\SQLitePCLRaw.core.dll
+
+ ..\..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
+
+
+ ..\..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
..\..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.14\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll
@@ -401,13 +407,15 @@
-
+
+
-
+
+
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu.GTK/app.config b/AideDeJeu/AideDeJeu.GTK/app.config
index a8b6c3cc..c1bce7a3 100644
--- a/AideDeJeu/AideDeJeu.GTK/app.config
+++ b/AideDeJeu/AideDeJeu.GTK/app.config
@@ -8,7 +8,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
@@ -44,11 +44,11 @@
-
+
-
+
@@ -56,7 +56,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -96,7 +96,7 @@
-
+
@@ -118,6 +118,10 @@
+
+
+
+
diff --git a/AideDeJeu/AideDeJeu.GTK/packages.config b/AideDeJeu/AideDeJeu.GTK/packages.config
index 90bd842a..65db3ff4 100644
--- a/AideDeJeu/AideDeJeu.GTK/packages.config
+++ b/AideDeJeu/AideDeJeu.GTK/packages.config
@@ -1,44 +1,49 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
index ee4ac2eb..c8990f67 100644
--- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
+++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
@@ -387,8 +387,11 @@
+
+ 3.1.8
+
- 2.0.3
+ 3.1.8
2.0.0.3
@@ -397,11 +400,11 @@
1.60.0
- 2.80.1
+ 2.80.2
- 1.6.292
+ 1.7.335
4.7.1
diff --git a/AideDeJeu/AideDeJeu.UWP/PdfViewRenderer.cs b/AideDeJeu/AideDeJeu.UWP/PdfViewRenderer.cs
index eca5e0c0..40793f1e 100644
--- a/AideDeJeu/AideDeJeu.UWP/PdfViewRenderer.cs
+++ b/AideDeJeu/AideDeJeu.UWP/PdfViewRenderer.cs
@@ -12,7 +12,7 @@ using Windows.Storage;
using Xamarin.Forms;
using Xamarin.Forms.Platform.UWP;
-[assembly: ExportRenderer(typeof(PdfView), typeof(PdfViewRenderer))]
+[assembly: Xamarin.Forms.Platform.UWP.ExportRenderer(typeof(PdfView), typeof(PdfViewRenderer))]
namespace AideDeJeu.UWP
{
public class PdfViewRenderer : WebViewRenderer
diff --git a/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
index a10ea9dc..82e4b6d8 100644
--- a/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
+++ b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
@@ -1,7 +1,7 @@
-
+
Debug
@@ -87,46 +87,67 @@
..\..\packages\Markdig.0.21.1\lib\net452\Markdig.dll
- ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+ ..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\..\packages\Microsoft.Data.Sqlite.Core.2.0.1\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
+
+ ..\..\packages\Microsoft.Bcl.HashCode.1.1.0\lib\net461\Microsoft.Bcl.HashCode.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll
+
+ ..\..\packages\Microsoft.Data.Sqlite.Core.3.1.8\lib\netstandard2.0\Microsoft.Data.Sqlite.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.Relational.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll
+
+ ..\..\packages\Microsoft.DotNet.PlatformAbstractions.3.1.6\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
-
- ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.2.0.3\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll
-
- ..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.Caching.Memory.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll
-
- ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll
+
+ ..\..\packages\Microsoft.EntityFrameworkCore.Sqlite.Core.3.1.8\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Sqlite.dll
-
- ..\..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll
+
+ ..\..\packages\Microsoft.Extensions.Caching.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+ ..\..\packages\Microsoft.Extensions.Caching.Memory.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll
-
- ..\..\packages\Microsoft.Extensions.Logging.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.dll
+
+ ..\..\packages\Microsoft.Extensions.Configuration.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll
-
- ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
+
+ ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll
-
- ..\..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+ ..\..\packages\Microsoft.Extensions.Configuration.Binder.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll
-
- ..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
+
+ ..\..\packages\Microsoft.Extensions.DependencyInjection.3.1.8\lib\net461\Microsoft.Extensions.DependencyInjection.dll
+
+
+ ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ ..\..\packages\Microsoft.Extensions.DependencyModel.3.1.6\lib\net451\Microsoft.Extensions.DependencyModel.dll
+
+
+ ..\..\packages\Microsoft.Extensions.Logging.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Logging.dll
+
+
+ ..\..\packages\Microsoft.Extensions.Logging.Abstractions.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll
+
+
+ ..\..\packages\Microsoft.Extensions.Options.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+
+ ..\..\packages\Microsoft.Extensions.Primitives.3.1.8\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
+
+
+ ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
..\..\packages\OpenTK.3.2\lib\net20\OpenTK.dll
@@ -134,44 +155,47 @@
..\..\packages\OpenTK.GLControl.3.1.0\lib\net20\OpenTK.GLControl.dll
-
- ..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll
+
+ ..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll
- ..\..\packages\SkiaSharp.2.80.1\lib\net462\SkiaSharp.dll
+ ..\..\packages\SkiaSharp.2.80.2\lib\net462\SkiaSharp.dll
..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll
- ..\..\packages\SkiaSharp.Views.2.80.1\lib\net462\SkiaSharp.Views.Desktop.dll
+ ..\..\packages\SkiaSharp.Views.2.80.2\lib\net462\SkiaSharp.Views.Desktop.dll
- ..\..\packages\SkiaSharp.Views.Desktop.Common.2.80.1\lib\net462\SkiaSharp.Views.Desktop.Common.dll
+ ..\..\packages\SkiaSharp.Views.Desktop.Common.2.80.2\lib\net462\SkiaSharp.Views.Desktop.Common.dll
- ..\..\packages\SkiaSharp.Views.Forms.WPF.2.80.1\lib\net462\SkiaSharp.Views.Forms.dll
+ ..\..\packages\SkiaSharp.Views.Forms.WPF.2.80.2\lib\net462\SkiaSharp.Views.Forms.dll
- ..\..\packages\SkiaSharp.Views.Gtk2.2.80.1\lib\net462\SkiaSharp.Views.Gtk.dll
+ ..\..\packages\SkiaSharp.Views.Gtk2.2.80.2\lib\net462\SkiaSharp.Views.Gtk.dll
- ..\..\packages\SkiaSharp.Views.WindowsForms.2.80.1\lib\net462\SkiaSharp.Views.WindowsForms.dll
+ ..\..\packages\SkiaSharp.Views.WindowsForms.2.80.2\lib\net462\SkiaSharp.Views.WindowsForms.dll
- ..\..\packages\SkiaSharp.Views.WPF.2.80.1\lib\net462\SkiaSharp.Views.WPF.dll
+ ..\..\packages\SkiaSharp.Views.WPF.2.80.2\lib\net462\SkiaSharp.Views.WPF.dll
-
- ..\..\packages\sqlite-net-pcl.1.6.292\lib\netstandard1.1\SQLite-net.dll
+
+ ..\..\packages\sqlite-net-pcl.1.7.335\lib\netstandard2.0\SQLite-net.dll
-
- ..\..\packages\SQLitePCLRaw.bundle_green.1.1.14\lib\net45\SQLitePCLRaw.batteries_green.dll
+
+ ..\..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll
-
- ..\..\packages\SQLitePCLRaw.bundle_green.1.1.14\lib\net45\SQLitePCLRaw.batteries_v2.dll
+
+ ..\..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll
-
- ..\..\packages\SQLitePCLRaw.core.1.1.14\lib\net45\SQLitePCLRaw.core.dll
+
+ ..\..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll
+
+
+ ..\..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll
..\..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.14\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll
@@ -233,6 +257,11 @@
True
True
+
+ ..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
+ True
+ True
+
..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
@@ -339,16 +368,18 @@
-
-
-
+
+
+
+
-
-
+
+
+
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu.WPF/App.config b/AideDeJeu/AideDeJeu.WPF/App.config
index 0a7d72ad..1b6f30bd 100644
--- a/AideDeJeu/AideDeJeu.WPF/App.config
+++ b/AideDeJeu/AideDeJeu.WPF/App.config
@@ -23,11 +23,11 @@
-
+
-
+
@@ -61,6 +61,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu.WPF/packages.config b/AideDeJeu/AideDeJeu.WPF/packages.config
index 531ea671..843843e4 100644
--- a/AideDeJeu/AideDeJeu.WPF/packages.config
+++ b/AideDeJeu/AideDeJeu.WPF/packages.config
@@ -1,39 +1,51 @@
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -54,6 +66,7 @@
+
diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
index e97d0ca4..0a07e554 100644
--- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
+++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
@@ -215,10 +215,10 @@
- 2.0.3
+ 3.1.8
- 2.0.3
+ 3.1.8
2.0.0.3
@@ -227,13 +227,13 @@
1.60.0
- 2.80.1
+ 2.80.2
- 2.80.1
+ 2.80.2
- 1.6.292
+ 1.7.335
4.5.1
@@ -245,10 +245,10 @@
1.5.3.2
- 4.8.0.1364
+ 4.8.0.1451
- 4.8.0.1364
+ 4.8.0.1451
1.0.0
diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index 414963d1..fc64aff1 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -98,17 +98,17 @@
-
-
+
+
-
-
-
+
+
+
-
+
diff --git a/AideDeJeu/AideDeJeu/Models/Backgrounds/BackgroundItem.cs b/AideDeJeu/AideDeJeu/Models/Backgrounds/BackgroundItem.cs
index f62b0b12..52949f0c 100644
--- a/AideDeJeu/AideDeJeu/Models/Backgrounds/BackgroundItem.cs
+++ b/AideDeJeu/AideDeJeu/Models/Backgrounds/BackgroundItem.cs
@@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.Serialization;
using System.Text.RegularExpressions;
using YamlDotNet.Serialization;
@@ -147,6 +148,7 @@ namespace AideDeJeuLib
}
}
+ [IgnoreDataMember]
[YamlMember(Order = 19)]
public IEnumerable SubBackgrounds
{
@@ -154,6 +156,10 @@ namespace AideDeJeuLib
{
return GetChildren();
}
+ private set
+ {
+
+ }
}
}
}
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs
index 94f67c7e..ae1d0b99 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Library/FilterViewModel.cs
@@ -289,7 +289,7 @@ namespace AideDeJeu.ViewModels.Library
await StoreViewModel.SemaphoreLibrary.WaitAsync();
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
- return context.Spells.Where(spell =>
+ return context.Spells.AsEnumerable().Where(spell =>
spell.Family == this.Family &&
levelComparer.Compare(spell.Level, levelMin) >= 0 &&
levelComparer.Compare(spell.Level, levelMax) <= 0 &&
@@ -438,7 +438,7 @@ namespace AideDeJeu.ViewModels.Library
//var funcAll = Expression.AndAlso(funcSize.Body, funcFamily.Body);
//var lambdaAll = Expression.Lambda>(funcAll, funcSize.Parameters[0]);
//return context.Monsters.Where(lambdaAll).ToList();
- return context.Monsters.Where(monster =>
+ return context.Monsters.AsEnumerable().Where(monster =>
(string.IsNullOrEmpty(this.Family) || (monster.Family != null && monster.Family.ToLower().Equals(this.Family.ToLower()))) &&
(string.IsNullOrEmpty(size) || (monster.Size != null && monster.Size.ToLower().Equals(size.ToLower()))) &&
(string.IsNullOrEmpty(type) || (monster.Type != null && monster.Type.ToLower().Contains(type.ToLower()))) &&
@@ -518,7 +518,7 @@ namespace AideDeJeu.ViewModels.Library
await StoreViewModel.SemaphoreLibrary.WaitAsync();
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
- return context.Equipments.Where(equipment =>
+ return context.Equipments.AsEnumerable().Where(equipment =>
equipment.Type.ToLower().Contains(type.ToLower()) &&
priceComparer.Compare(equipment.Price, minPrice) >= 0 &&
priceComparer.Compare(equipment.Price, maxPrice) <= 0 &&
@@ -588,7 +588,7 @@ namespace AideDeJeu.ViewModels.Library
await StoreViewModel.SemaphoreLibrary.WaitAsync();
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
- return context.MagicItems.Where(magicitem =>
+ return context.MagicItems.AsEnumerable().Where(magicitem =>
MatchContains(magicitem.Type, type) &&
MatchContains(magicitem.Rarity, rarity) &&
MatchContains(magicitem.Attunement, attunement) &&
diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
index 7953ac87..78ee2467 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
@@ -199,7 +199,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{
if (alignment == null)
{
- return await context.Alignments.OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToListAsync().ConfigureAwait(false);
+ //return await context.Alignments.OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToListAsync().ConfigureAwait(false);
+ return context.Alignments.AsEnumerable().OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToList();
}
else
{
@@ -243,7 +244,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
var expandedRaces = new List();
- var races = context.Races.Where(r => r.GetType() == typeof(RaceItem));
+ var races = context.Races.AsEnumerable().Where(r => r.GetType() == typeof(RaceItem));
foreach (var race in races)
{
if (race.HasSubRaces)
@@ -273,7 +274,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
- return await context.Classes.Where(c => !(c is SubClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).Select(c => new ClassViewModel() { Class = c }).ToListAsync().ConfigureAwait(false);
+ //return await context.Classes.Where(c => !(c is SubClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).Select(c => new ClassViewModel() { Class = c }).ToListAsync().ConfigureAwait(false);
+ return context.Classes.AsEnumerable().Where(c => !(c is SubClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).Select(c => new ClassViewModel() { Class = c }).ToList();
}
}
#endregion Class
@@ -665,7 +667,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
- var list = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync().ConfigureAwait(false);
+ //var list = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync().ConfigureAwait(false);
+ var list = context.Backgrounds.AsEnumerable().Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToList();
return list;
}
}
@@ -790,7 +793,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
- var list = await context.SubBackgrounds.Where(item => item.ParentLink == background.Id).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync().ConfigureAwait(false);
+ //var list = await context.SubBackgrounds.Where(item => item.ParentLink == background.Id).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync().ConfigureAwait(false);
+ var list = context.SubBackgrounds.AsEnumerable().Where(item => item.ParentLink == background.Id).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToList();
list.Insert(0, new SubBackgroundItem() { Name = "-" });
return list;
}
diff --git a/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs
index da8670e5..3051b049 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs
@@ -686,6 +686,7 @@ namespace AideDeJeu.ViewModels
public AideDeJeuContext(string dbPath)
{
+ SQLitePCL.Batteries_V2.Init();
this.DbPath = dbPath;
}
diff --git a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
index 2627e9b0..26b27b48 100644
--- a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
+++ b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
@@ -14,13 +14,13 @@
-
-
-
+
+
+
-
+
diff --git a/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj b/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj
index 4253e86b..0c3a348e 100644
--- a/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj
+++ b/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj
@@ -9,13 +9,13 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
index f45cd268..559d9ab9 100644
--- a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
+++ b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
@@ -11,14 +11,14 @@
-
-
-
-
+
+
+
+
-
+