Maj nuget + flutter

2025-10-29 14:35:45 +00:00 · 2020-05-16 02:26:51 +02:00 · 2020-05-16 02:26:51 +02:00 · 108fc25313
commit 108fc25313
parent 695f014d83
21 changed files with 8783 additions and 1065 deletions
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@ -33,8 +33,8 @@
    <BundleAssemblies>false</BundleAssemblies>
    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
    <MandroidI18n>West</MandroidI18n>
-	<MainLogo>battle_axe</MainLogo>
+    <MainLogo>battle_axe</MainLogo>
-	<LibraryName>library</LibraryName>
+    <LibraryName>library</LibraryName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_JoA|AnyCPU'">
    <AndroidManifest>Properties\AndroidManifest.JoA.xml</AndroidManifest>
@ -53,8 +53,8 @@
    <BundleAssemblies>false</BundleAssemblies>
    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
    <MandroidI18n>West</MandroidI18n>
-	<MainLogo>high_shot</MainLogo>
+    <MainLogo>high_shot</MainLogo>
-	<LibraryName>library_JoA</LibraryName>
+    <LibraryName>library_JoA</LibraryName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_CO|AnyCPU'">
    <AndroidManifest>Properties\AndroidManifest.CO.xml</AndroidManifest>
@ -73,8 +73,8 @@
    <BundleAssemblies>false</BundleAssemblies>
    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
    <MandroidI18n>West</MandroidI18n>
-	<MainLogo>tied_scroll</MainLogo>
+    <MainLogo>tied_scroll</MainLogo>
-	<LibraryName>library_CO</LibraryName>
+    <LibraryName>library_CO</LibraryName>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
@ -100,8 +100,8 @@
    <AndroidDexTool>d8</AndroidDexTool>
    <AndroidLinkTool>r8</AndroidLinkTool>
    <MandroidI18n>West</MandroidI18n>
-	<MainLogo>battle_axe</MainLogo>
+    <MainLogo>battle_axe</MainLogo>
-	<LibraryName>library</LibraryName>
+    <LibraryName>library</LibraryName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_JoA|AnyCPU'">
    <AndroidManifest>Properties\AndroidManifest.JoA.xml</AndroidManifest>
@ -128,8 +128,8 @@
    <AndroidDexTool>d8</AndroidDexTool>
    <AndroidLinkTool>r8</AndroidLinkTool>
    <MandroidI18n>West</MandroidI18n>
-	<MainLogo>high_shot</MainLogo>
+    <MainLogo>high_shot</MainLogo>
-	<LibraryName>library_JoA</LibraryName>
+    <LibraryName>library_JoA</LibraryName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CO|AnyCPU'">
    <AndroidManifest>Properties\AndroidManifest.CO.xml</AndroidManifest>
@ -156,8 +156,8 @@
    <AndroidDexTool>d8</AndroidDexTool>
    <AndroidLinkTool>r8</AndroidLinkTool>
    <MandroidI18n>West</MandroidI18n>
-	<MainLogo>tied_scroll</MainLogo>
+    <MainLogo>tied_scroll</MainLogo>
-	<LibraryName>library_CO</LibraryName>
+    <LibraryName>library_CO</LibraryName>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Mono.Android" />
@ -174,16 +174,16 @@
      <Version>2.0.3</Version>
    </PackageReference>
    <PackageReference Include="Rg.Plugins.Popup">
-      <Version>1.2.0.223</Version>
+      <Version>2.0.0.2</Version>
    </PackageReference>
    <PackageReference Include="SkiaSharp.Svg">
      <Version>1.60.0</Version>
    </PackageReference>
    <PackageReference Include="SkiaSharp.Views">
-      <Version>1.68.1</Version>
+      <Version>1.68.2.1</Version>
    </PackageReference>
    <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.68.1</Version>
+      <Version>1.68.2.1</Version>
    </PackageReference>
    <PackageReference Include="sqlite-net-pcl">
      <Version>1.6.292</Version>
@ -198,19 +198,19 @@
      <Version>1.1.14</Version>
    </PackageReference>
    <PackageReference Include="System.Buffers">
-      <Version>4.5.0</Version>
+      <Version>4.5.1</Version>
    </PackageReference>
    <PackageReference Include="UrhoSharp.Forms">
      <Version>1.9.67</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.3.1</Version>
+      <Version>1.5.3.2</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Forms">
-      <Version>4.4.0.991265</Version>
+      <Version>4.6.0.772</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Forms.Visual.Material">
-      <Version>4.4.0.991265</Version>
+      <Version>4.6.0.772</Version>
    </PackageReference>
    <PackageReference Include="XamiTextSharpLGPLv2">
      <Version>1.0.0</Version>
@ -230,17 +230,17 @@
    <AndroidAsset Include="Assets\LinLibertine_RI.ttf" />
  </ItemGroup>
  <ItemGroup>
-	<AndroidAsset Include="..\..\Data\$(LibraryName).db">
+    <AndroidAsset Include="..\..\Data\$(LibraryName).db">
-	  <Link>Assets\library.db</Link>
+      <Link>Assets\library.db</Link>
-	</AndroidAsset>
+    </AndroidAsset>
  </ItemGroup>
  <ItemGroup>
-	<AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo).png">
+    <AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo).png">
-	  <Link>Resources\drawable\main.png</Link>
+      <Link>Resources\drawable\main.png</Link>
-	</AndroidResource>
+    </AndroidResource>
-	<AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo)_big.png">
+    <AndroidResource Include="..\..\Data\Icons\Resources\drawable\$(MainLogo)_big.png">
-	  <Link>Resources\drawable\main_big.png</Link>
+      <Link>Resources\drawable\main_big.png</Link>
-	</AndroidResource>
+    </AndroidResource>
    <AndroidAsset Include="..\..\Data\library.ver">
      <Link>Assets\library.ver</Link>
    </AndroidAsset>
@ -577,7 +577,7 @@
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\drawable-xxhdpi\high_shot.png" />
-  </ItemGroup>--> 
+  </ItemGroup>-->
  <ItemGroup>
    <AndroidResource Include="Resources\drawable\battle_axe_.xml" />
  </ItemGroup>
--- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
+++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
--- a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
+++ b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -106,11 +106,11 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\gtk-sharp.dll</HintPath>
    </Reference>
-    <Reference Include="Markdig, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Markdig, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Markdig.0.18.0\lib\net40\Markdig.dll</HintPath>
+      <HintPath>..\..\packages\Markdig.0.20.0\lib\netstandard2.0\Markdig.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Data.Sqlite, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Data.Sqlite.Core.2.0.1\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
@ -169,8 +169,8 @@
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
-    <Reference Include="OpenTK, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+    <Reference Include="OpenTK, Version=3.2.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK.3.1.0\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\..\packages\OpenTK.3.2\lib\net20\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="OpenTK.GLControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
      <HintPath>..\..\packages\OpenTK.GLControl.3.1.0\lib\net20\OpenTK.GLControl.dll</HintPath>
@ -182,26 +182,26 @@
    <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
    </Reference>
-    <Reference Include="Rg.Plugins.Popup, Version=1.2.0.223, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Rg.Plugins.Popup, Version=2.0.0.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Rg.Plugins.Popup.1.2.0.223\lib\netstandard1.0\Rg.Plugins.Popup.dll</HintPath>
+      <HintPath>..\..\packages\Rg.Plugins.Popup.2.0.0.2\lib\netstandard2.0\Rg.Plugins.Popup.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.1.68.1\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.1.68.2.1\lib\net462\SkiaSharp.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Desktop, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.1.68.1\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.1.68.2.1\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Desktop.Common, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.Desktop.Common.1.68.1\lib\net45\SkiaSharp.Views.Desktop.Common.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Desktop.Common.1.68.2.1\lib\net45\SkiaSharp.Views.Desktop.Common.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Gtk, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.Gtk2.1.68.1\lib\net45\SkiaSharp.Views.Gtk.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Gtk2.1.68.2.1\lib\net45\SkiaSharp.Views.Gtk.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.WindowsForms, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.WindowsForms.1.68.1\lib\net45\SkiaSharp.Views.WindowsForms.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.WindowsForms.1.68.2.1\lib\net45\SkiaSharp.Views.WindowsForms.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.WPF, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.WPF.1.68.1\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.WPF.1.68.2.1\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
    </Reference>
    <Reference Include="SQLite-net, Version=1.6.292.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\packages\sqlite-net-pcl.1.6.292\lib\netstandard1.1\SQLite-net.dll</HintPath>
@ -220,10 +220,10 @@
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
@ -232,22 +232,22 @@
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Core" />
    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.7.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
    <Reference Include="System.Drawing" />
    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Drawing.Common.4.7.0\lib\net461\System.Drawing.Common.dll</HintPath>
    </Reference>
-    <Reference Include="System.Interactive.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+    <Reference Include="System.Interactive.Async, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll</HintPath>
+      <HintPath>..\..\packages\System.Interactive.Async.4.1.1\lib\net461\System.Interactive.Async.dll</HintPath>
    </Reference>
    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Linq.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+    <Reference Include="System.Linq.Async, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
+      <HintPath>..\..\packages\System.Linq.Async.4.1.1\lib\net461\System.Linq.Async.dll</HintPath>
    </Reference>
    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
@ -255,7 +255,7 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
+      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -272,7 +272,7 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
@ -284,8 +284,8 @@
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
@ -297,22 +297,22 @@
      <HintPath>..\..\packages\UrhoSharp.Forms.1.9.67\lib\netstandard2.0\UrhoSharp.Forms.dll</HintPath>
    </Reference>
    <Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.4.0.991265\lib\net45\webkit-sharp.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.6.0.772\lib\net45\webkit-sharp.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Essentials, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Essentials.1.3.1\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Essentials.1.5.3.2\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.4.4.0.991265\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.4.6.0.772\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.4.4.0.991265\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.4.6.0.772\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.4.0.991265\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.6.0.772\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.4.4.0.991265\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.4.6.0.772\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
    </Reference>
    <Reference Include="XamiTextSharpLGPLv2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\packages\XamiTextSharpLGPLv2.1.0.0\lib\netstandard2.0\XamiTextSharpLGPLv2.dll</HintPath>
@ -397,13 +397,13 @@
    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props'))" />
+    <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props'))" />
-    <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets'))" />
  </Target>
  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets')" />
-  <Import Project="..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets')" />
 </Project>
--- a/AideDeJeu/AideDeJeu.GTK/app.config
+++ b/AideDeJeu/AideDeJeu.GTK/app.config
@ -12,7 +12,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Extensions.Caching.Memory" publicKeyToken="adb9793829ddae60" culture="neutral" />
@ -80,11 +80,11 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
--- a/AideDeJeu/AideDeJeu.GTK/packages.config
+++ b/AideDeJeu/AideDeJeu.GTK/packages.config
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Markdig" version="0.18.0" targetFramework="net471" />
+  <package id="Markdig" version="0.20.0" targetFramework="net471" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net471" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net471" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net471" />
  <package id="Microsoft.Data.Sqlite.Core" version="2.0.1" targetFramework="net471" />
  <package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net471" />
@ -23,16 +23,16 @@
  <package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net471" />
  <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net471" />
  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net471" />
-  <package id="OpenTK" version="3.1.0" targetFramework="net471" />
+  <package id="OpenTK" version="3.2" targetFramework="net471" />
  <package id="OpenTK.GLControl" version="3.1.0" targetFramework="net471" />
  <package id="Remotion.Linq" version="2.1.1" targetFramework="net471" />
-  <package id="Rg.Plugins.Popup" version="1.2.0.223" targetFramework="net471" />
+  <package id="Rg.Plugins.Popup" version="2.0.0.2" targetFramework="net471" />
-  <package id="SkiaSharp" version="1.68.1" targetFramework="net471" />
+  <package id="SkiaSharp" version="1.68.2.1" targetFramework="net471" />
-  <package id="SkiaSharp.Views" version="1.68.1" targetFramework="net471" />
+  <package id="SkiaSharp.Views" version="1.68.2.1" targetFramework="net471" />
-  <package id="SkiaSharp.Views.Desktop.Common" version="1.68.1" targetFramework="net471" />
+  <package id="SkiaSharp.Views.Desktop.Common" version="1.68.2.1" targetFramework="net471" />
-  <package id="SkiaSharp.Views.Gtk2" version="1.68.1" targetFramework="net471" />
+  <package id="SkiaSharp.Views.Gtk2" version="1.68.2.1" targetFramework="net471" />
-  <package id="SkiaSharp.Views.WindowsForms" version="1.68.1" targetFramework="net471" />
+  <package id="SkiaSharp.Views.WindowsForms" version="1.68.2.1" targetFramework="net471" />
-  <package id="SkiaSharp.Views.WPF" version="1.68.1" targetFramework="net471" />
+  <package id="SkiaSharp.Views.WPF" version="1.68.2.1" targetFramework="net471" />
  <package id="sqlite-net-pcl" version="1.6.292" targetFramework="net471" />
  <package id="SQLitePCLRaw.bundle_green" version="1.1.14" targetFramework="net471" />
  <package id="SQLitePCLRaw.core" version="1.1.14" targetFramework="net471" />
@ -40,34 +40,34 @@
  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.14" targetFramework="net471" />
  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.14" targetFramework="net471" />
  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.14" targetFramework="net471" />
-  <package id="System.Buffers" version="4.5.0" targetFramework="net471" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net471" />
  <package id="System.Collections" version="4.3.0" targetFramework="net471" />
-  <package id="System.Collections.Immutable" version="1.7.0" targetFramework="net471" />
+  <package id="System.Collections.Immutable" version="1.7.1" targetFramework="net471" />
  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net471" />
  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net471" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.7.0" targetFramework="net471" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net471" />
  <package id="System.Drawing.Common" version="4.7.0" targetFramework="net471" />
-  <package id="System.Interactive.Async" version="4.0.0" targetFramework="net471" />
+  <package id="System.Interactive.Async" version="4.1.1" targetFramework="net471" />
  <package id="System.Linq" version="4.3.0" targetFramework="net471" />
-  <package id="System.Linq.Async" version="4.0.0" targetFramework="net471" />
+  <package id="System.Linq.Async" version="4.1.1" targetFramework="net471" />
  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net471" />
  <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net471" />
-  <package id="System.Memory" version="4.5.3" targetFramework="net471" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net471" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net471" />
  <package id="System.ObjectModel" version="4.3.0" targetFramework="net471" />
  <package id="System.Reflection" version="4.3.0" targetFramework="net471" />
  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net471" />
  <package id="System.Runtime" version="4.3.1" targetFramework="net471" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net471" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net471" />
  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net471" />
  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net471" />
  <package id="System.Threading" version="4.3.0" targetFramework="net471" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net471" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net471" />
  <package id="UrhoSharp.Forms" version="1.9.67" targetFramework="net471" />
-  <package id="Xamarin.Essentials" version="1.3.1" targetFramework="net471" />
+  <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net471" />
-  <package id="Xamarin.Forms" version="4.4.0.991265" targetFramework="net471" />
+  <package id="Xamarin.Forms" version="4.6.0.772" targetFramework="net471" />
-  <package id="Xamarin.Forms.Platform.GTK" version="4.4.0.991265" targetFramework="net471" />
+  <package id="Xamarin.Forms.Platform.GTK" version="4.6.0.772" targetFramework="net471" />
-  <package id="Xamarin.Forms.Visual.Material" version="4.4.0.991265" targetFramework="net471" />
+  <package id="Xamarin.Forms.Visual.Material" version="4.6.0.772" targetFramework="net471" />
  <package id="XamiTextSharpLGPLv2" version="1.0.0" targetFramework="net471" />
  <package id="YamlDotNet" version="6.1.2" targetFramework="net471" />
 </packages>
--- a/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
+++ b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.1\build\net45\SkiaSharp.Views.Forms.WPF.props" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.1\build\net45\SkiaSharp.Views.Forms.WPF.props')" />
+  <Import Project="..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.2.1\build\net45\SkiaSharp.Views.Forms.WPF.props" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.2.1\build\net45\SkiaSharp.Views.Forms.WPF.props')" />
-  <Import Project="..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props')" />
+  <Import Project="..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -83,11 +83,11 @@
    <Prefer32Bit>true</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Markdig, Version=0.18.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Markdig, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Markdig.0.18.0\lib\net40\Markdig.dll</HintPath>
+      <HintPath>..\..\packages\Markdig.0.20.0\lib\netstandard2.0\Markdig.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Data.Sqlite, Version=2.0.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Data.Sqlite.Core.2.0.1\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
@ -128,8 +128,8 @@
    <Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
    </Reference>
-    <Reference Include="OpenTK, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+    <Reference Include="OpenTK, Version=3.2.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK.3.1.0\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\..\packages\OpenTK.3.2\lib\net20\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="OpenTK.GLControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
      <HintPath>..\..\packages\OpenTK.GLControl.3.1.0\lib\net20\OpenTK.GLControl.dll</HintPath>
@ -138,28 +138,28 @@
      <HintPath>..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.1.68.1\lib\net45\SkiaSharp.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.1.68.2.1\lib\net462\SkiaSharp.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Extended.Svg, Version=1.60.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SkiaSharp.Svg.1.60.0\lib\netstandard2.0\SkiaSharp.Extended.Svg.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Desktop, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.1.68.1\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.1.68.2.1\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Desktop.Common, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.Desktop.Common.1.68.1\lib\net45\SkiaSharp.Views.Desktop.Common.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Desktop.Common.1.68.2.1\lib\net45\SkiaSharp.Views.Desktop.Common.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Forms, Version=1.68.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.1\lib\net45\SkiaSharp.Views.Forms.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.2.1\lib\net45\SkiaSharp.Views.Forms.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.Gtk, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.Gtk2.1.68.1\lib\net45\SkiaSharp.Views.Gtk.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.Gtk2.1.68.2.1\lib\net45\SkiaSharp.Views.Gtk.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.WindowsForms, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.WindowsForms.1.68.1\lib\net45\SkiaSharp.Views.WindowsForms.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.WindowsForms.1.68.2.1\lib\net45\SkiaSharp.Views.WindowsForms.dll</HintPath>
    </Reference>
    <Reference Include="SkiaSharp.Views.WPF, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SkiaSharp.Views.WPF.1.68.1\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
+      <HintPath>..\..\packages\SkiaSharp.Views.WPF.1.68.2.1\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
    </Reference>
    <Reference Include="SQLite-net, Version=1.6.292.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\packages\sqlite-net-pcl.1.6.292\lib\netstandard1.1\SQLite-net.dll</HintPath>
@ -178,10 +178,10 @@
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
@ -190,18 +190,18 @@
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Data" />
    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.7.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
-    <Reference Include="System.Interactive.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+    <Reference Include="System.Interactive.Async, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Interactive.Async.4.0.0\lib\net461\System.Interactive.Async.dll</HintPath>
+      <HintPath>..\..\packages\System.Interactive.Async.4.1.1\lib\net461\System.Interactive.Async.dll</HintPath>
    </Reference>
    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Linq.Async, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+    <Reference Include="System.Linq.Async, Version=4.1.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Async.4.0.0\lib\net461\System.Linq.Async.dll</HintPath>
+      <HintPath>..\..\packages\System.Linq.Async.4.1.1\lib\net461\System.Linq.Async.dll</HintPath>
    </Reference>
    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
@ -209,7 +209,7 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
+      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@ -226,15 +226,15 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="Microsoft.CSharp" />
@ -252,19 +252,19 @@
    <Reference Include="PresentationCore" />
    <Reference Include="PresentationFramework" />
    <Reference Include="Xamarin.Essentials, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Essentials.1.3.1\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Essentials.1.5.3.2\lib\netstandard2.0\Xamarin.Essentials.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.4.4.0.991265\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.4.6.0.772\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Platform, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.4.4.0.991265\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.4.6.0.772\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Platform.WPF, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Platform.WPF.4.4.0.991265\lib\net45\Xamarin.Forms.Platform.WPF.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Platform.WPF.4.6.0.772\lib\net45\Xamarin.Forms.Platform.WPF.dll</HintPath>
    </Reference>
    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.4.4.0.991265\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.4.6.0.772\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
    </Reference>
    <Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
      <HintPath>..\..\packages\YamlDotNet.6.1.2\lib\net45\YamlDotNet.dll</HintPath>
@ -339,16 +339,16 @@
    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.props'))" />
+    <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.props'))" />
-    <Error Condition="!Exists('..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets'))" />
-    <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.1\build\net45\SkiaSharp.Views.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.1.68.1\build\net45\SkiaSharp.Views.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.2.1\build\net45\SkiaSharp.Views.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.1.68.2.1\build\net45\SkiaSharp.Views.Forms.targets'))" />
-    <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.1\build\net45\SkiaSharp.Views.Forms.WPF.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.1\build\net45\SkiaSharp.Views.Forms.WPF.props'))" />
+    <Error Condition="!Exists('..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.2.1\build\net45\SkiaSharp.Views.Forms.WPF.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SkiaSharp.Views.Forms.WPF.1.68.2.1\build\net45\SkiaSharp.Views.Forms.WPF.props'))" />
  </Target>
  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.14\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.4.0.991265\build\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.2.1\build\net462\SkiaSharp.targets')" />
-  <Import Project="..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets" Condition="Exists('..\..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.6.0.772\build\Xamarin.Forms.targets')" />
-  <Import Project="..\..\packages\SkiaSharp.Views.Forms.1.68.1\build\net45\SkiaSharp.Views.Forms.targets" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.1\build\net45\SkiaSharp.Views.Forms.targets')" />
+  <Import Project="..\..\packages\SkiaSharp.Views.Forms.1.68.2.1\build\net45\SkiaSharp.Views.Forms.targets" Condition="Exists('..\..\packages\SkiaSharp.Views.Forms.1.68.2.1\build\net45\SkiaSharp.Views.Forms.targets')" />
 </Project>
--- a/AideDeJeu/AideDeJeu.WPF/App.config
+++ b/AideDeJeu/AideDeJeu.WPF/App.config
@ -15,7 +15,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@ -35,7 +35,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@ -57,6 +57,10 @@
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/AideDeJeu/AideDeJeu.WPF/packages.config
+++ b/AideDeJeu/AideDeJeu.WPF/packages.config
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Markdig" version="0.18.0" targetFramework="net472" />
+  <package id="Markdig" version="0.20.0" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net472" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
  <package id="Microsoft.Data.Sqlite.Core" version="2.0.1" targetFramework="net472" />
  <package id="Microsoft.EntityFrameworkCore" version="2.0.3" targetFramework="net472" />
@ -16,18 +16,18 @@
  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.0.2" targetFramework="net472" />
  <package id="Microsoft.Extensions.Options" version="2.0.2" targetFramework="net472" />
  <package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net472" />
-  <package id="OpenTK" version="3.1.0" targetFramework="net472" />
+  <package id="OpenTK" version="3.2" targetFramework="net472" />
  <package id="OpenTK.GLControl" version="3.1.0" targetFramework="net472" />
  <package id="Remotion.Linq" version="2.1.1" targetFramework="net472" />
-  <package id="SkiaSharp" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp" version="1.68.2.1" targetFramework="net472" />
  <package id="SkiaSharp.Svg" version="1.60.0" targetFramework="net472" />
-  <package id="SkiaSharp.Views" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views" version="1.68.2.1" targetFramework="net472" />
-  <package id="SkiaSharp.Views.Desktop.Common" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views.Desktop.Common" version="1.68.2.1" targetFramework="net472" />
-  <package id="SkiaSharp.Views.Forms" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views.Forms" version="1.68.2.1" targetFramework="net472" />
-  <package id="SkiaSharp.Views.Forms.WPF" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views.Forms.WPF" version="1.68.2.1" targetFramework="net472" />
-  <package id="SkiaSharp.Views.Gtk2" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views.Gtk2" version="1.68.2.1" targetFramework="net472" />
-  <package id="SkiaSharp.Views.WindowsForms" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views.WindowsForms" version="1.68.2.1" targetFramework="net472" />
-  <package id="SkiaSharp.Views.WPF" version="1.68.1" targetFramework="net472" />
+  <package id="SkiaSharp.Views.WPF" version="1.68.2.1" targetFramework="net472" />
  <package id="sqlite-net-pcl" version="1.6.292" targetFramework="net472" />
  <package id="SQLitePCLRaw.bundle_green" version="1.1.14" targetFramework="net472" />
  <package id="SQLitePCLRaw.core" version="1.1.14" targetFramework="net472" />
@ -35,31 +35,31 @@
  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.14" targetFramework="net472" />
  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.14" targetFramework="net472" />
  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.14" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
  <package id="System.Collections" version="4.3.0" targetFramework="net472" />
-  <package id="System.Collections.Immutable" version="1.7.0" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="1.7.1" targetFramework="net472" />
  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net472" />
  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.7.0" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />
-  <package id="System.Interactive.Async" version="4.0.0" targetFramework="net472" />
+  <package id="System.Interactive.Async" version="4.1.1" targetFramework="net472" />
  <package id="System.Linq" version="4.3.0" targetFramework="net472" />
-  <package id="System.Linq.Async" version="4.0.0" targetFramework="net472" />
+  <package id="System.Linq.Async" version="4.1.1" targetFramework="net472" />
  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
  <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.3" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
  <package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
  <package id="System.Reflection" version="4.3.0" targetFramework="net472" />
  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
  <package id="System.Runtime" version="4.3.1" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net472" />
  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
  <package id="System.Threading" version="4.3.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
  <package id="UrhoSharp.Forms" version="1.9.67" targetFramework="net472" />
-  <package id="Xamarin.Essentials" version="1.3.1" targetFramework="net472" />
+  <package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net472" />
-  <package id="Xamarin.Forms" version="4.4.0.991265" targetFramework="net472" />
+  <package id="Xamarin.Forms" version="4.6.0.772" targetFramework="net472" />
-  <package id="Xamarin.Forms.Platform.WPF" version="4.4.0.991265" targetFramework="net472" />
+  <package id="Xamarin.Forms.Platform.WPF" version="4.6.0.772" targetFramework="net472" />
-  <package id="Xamarin.Forms.Visual.Material" version="4.4.0.991265" targetFramework="net472" />
+  <package id="Xamarin.Forms.Visual.Material" version="4.6.0.772" targetFramework="net472" />
  <package id="YamlDotNet" version="6.1.2" targetFramework="net472" />
 </packages>
--- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
+++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
@ -221,34 +221,34 @@
      <Version>2.0.3</Version>
    </PackageReference>
    <PackageReference Include="Rg.Plugins.Popup">
-      <Version>1.2.0.223</Version>
+      <Version>2.0.0.2</Version>
    </PackageReference>
    <PackageReference Include="SkiaSharp.Svg">
      <Version>1.60.0</Version>
    </PackageReference>
    <PackageReference Include="SkiaSharp.Views">
-      <Version>1.68.1</Version>
+      <Version>1.68.2.1</Version>
    </PackageReference>
    <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.68.1</Version>
+      <Version>1.68.2.1</Version>
    </PackageReference>
    <PackageReference Include="sqlite-net-pcl">
      <Version>1.6.292</Version>
    </PackageReference>
    <PackageReference Include="System.Buffers">
-      <Version>4.5.0</Version>
+      <Version>4.5.1</Version>
    </PackageReference>
    <PackageReference Include="UrhoSharp.Forms">
      <Version>1.9.67</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Essentials">
-      <Version>1.3.1</Version>
+      <Version>1.5.3.2</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Forms">
-      <Version>4.4.0.991265</Version>
+      <Version>4.6.0.772</Version>
    </PackageReference>
    <PackageReference Include="Xamarin.Forms.Visual.Material">
-      <Version>4.4.0.991265</Version>
+      <Version>4.6.0.772</Version>
    </PackageReference>
    <PackageReference Include="XamiTextSharpLGPLv2">
      <Version>1.0.0</Version>
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@ -85,19 +85,19 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Markdig" Version="0.18.0" />
+    <PackageReference Include="Markdig" Version="0.20.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
    <PackageReference Include="OnePlat.DiceNotation" Version="2.0.2" />
-    <PackageReference Include="Rg.Plugins.Popup" Version="1.2.0.223" />
+    <PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.2" />
    <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
-    <PackageReference Include="SkiaSharp.Views" Version="1.68.1" />
+    <PackageReference Include="SkiaSharp.Views" Version="1.68.2.1" />
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.1" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.2.1" />
    <PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
    <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.772" />
-    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.6.0.772" />
    <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
    <PackageReference Include="YamlDotNet" Version="6.1.2" />
  </ItemGroup>
--- a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
+++ b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
@ -13,14 +13,14 @@
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.17" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.23" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
    <PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
    <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.772" />
    <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
  </ItemGroup>
--- a/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj
+++ b/AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj
@ -14,8 +14,8 @@
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
    <PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
    <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.772" />
    <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
  </ItemGroup>
--- a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
+++ b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
@ -15,10 +15,10 @@
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
    <PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
    <PackageReference Include="UrhoSharp.Forms" Version="1.9.67" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.6.0.772" />
    <PackageReference Include="XamiTextSharpLGPLv2" Version="1.0.0" />
  </ItemGroup>
--- a/Hereva/witchcraft_fr.md
+++ b/Hereva/witchcraft_fr.md
@ -52,15 +52,18 @@ Mais ce ne sont pas mes premiers travaux. J'ai déjà écrit quelques supplémen
 Vous en trouverez quelques-unes ci-dessous sur cette page.
-<div style='margin-top:550px;'></div>
+
 <div class="wide">
 <div style='margin-top:500px;'></div>
 ## Plus de titres du même auteur
-Immortuos - Undead Monsters for D&D
+| <img src="https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Hereva/images/witch-0006.png" style='width:150px'/> | <img src="https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Hereva/images/witch-0007.png" style='width:150px'/> | <img src="https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Hereva/images/witch-0008.png" style='width:150px'/> |
 | :---: | :---: | :---: |
 | Immortuos - <br>Undead Monsters for D&D | The Book of Many Eyes - <br>Beholders for 5e | The Cursed Mountain |
-The Book of Many Eyes - Beholders for 5e
+</div>
 The Cursed Mountain
 <div class='pageNumber auto'></div>
--- a/aidedejeu_flutter/android/settings_aar.gradle
+++ b/aidedejeu_flutter/android/settings_aar.gradle
@ -0,0 +1 @@
 include ':app'
--- a/aidedejeu_flutter/assets/library.db
+++ b/aidedejeu_flutter/assets/library.db
--- a/aidedejeu_flutter/lib/test.dart
+++ b/aidedejeu_flutter/lib/test.dart
@ -1,4 +1,4 @@
-import 'dart:convert';
+/*import 'dart:convert';
 import 'package:http/http.dart' as http;
@ -17,3 +17,4 @@ class MyWebApi {
    }
  }
 }
 */
--- a/aidedejeu_flutter/lib/theme.dart
+++ b/aidedejeu_flutter/lib/theme.dart
@ -19,7 +19,7 @@ ThemeData mainTheme() {
      color: Colors.white,
      iconTheme: IconThemeData(color: Colors.black),
      textTheme: TextTheme(
-          title: TextStyle(
+          headline6: TextStyle(
              fontSize: 28.0,
              color: Colors.black,
              fontWeight: FontWeight.bold,
@ -31,34 +31,34 @@ ThemeData mainTheme() {
    fontFamily: 'LinuxLibertine',
    textTheme: TextTheme(
      // p
-      body1: TextStyle(
+      bodyText2: TextStyle(
        fontSize: 15.0,
        color: Colors.black,
        fontFamily: 'LinuxLibertine',
      ),
      // h1
-      headline: TextStyle(
+      headline5: TextStyle(
        fontSize: 30.0,
        color: colorHDRed,
        fontWeight: FontWeight.bold,
        fontFamily: 'Cinzel-Bold',
      ),
      // h2
-      title: TextStyle(
+      headline6: TextStyle(
        fontSize: 25.0,
        color: Colors.black,
        fontWeight: FontWeight.bold,
        fontFamily: 'Cinzel-Regular',
      ),
      // h3
-      subhead: TextStyle(
+      subtitle1: TextStyle(
        fontSize: 20.0,
        color: Colors.black,
        fontWeight: FontWeight.bold,
        fontFamily: 'Cinzel-Regular',
      ),
      // h4, h5, h6
-      body2: TextStyle(
+      bodyText1: TextStyle(
        fontSize: 18.0,
        color: Colors.black,
        fontWeight: FontWeight.bold,
--- a/aidedejeu_flutter/lib/widgets/homepage.dart
+++ b/aidedejeu_flutter/lib/widgets/homepage.dart
@ -20,7 +20,7 @@ class HomePage extends StatelessWidget {
            FlatButton.icon(
              label: Text(
                AppLocalizations.of(context).libraryTitle,
-                  style: Theme.of(context).textTheme.headline,
+                  style: Theme.of(context).textTheme.headline5,
              ),
              icon: SvgPicture.asset(
                "assets/spell-book.svg",
@ -40,7 +40,7 @@ class HomePage extends StatelessWidget {
            FlatButton.icon(
              label: Text(
                AppLocalizations.of(context).pceditorTitle,
-                style: Theme.of(context).textTheme.headline,
+                style: Theme.of(context).textTheme.headline5,
              ),
              icon: SvgPicture.asset(
                "assets/swordman.svg",
@ -58,7 +58,7 @@ class HomePage extends StatelessWidget {
            FlatButton.icon(
              label: Text(
                AppLocalizations.of(context).aboutTitle,
-                  style: Theme.of(context).textTheme.headline,
+                  style: Theme.of(context).textTheme.headline5,
              ),
              icon: SvgPicture.asset(
                "assets/wooden-sign.svg",
--- a/aidedejeu_flutter/pubspec.lock
+++ b/aidedejeu_flutter/pubspec.lock
@ -7,63 +7,63 @@ packages:
      name: _fe_analyzer_shared
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.3"
+    version: "3.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.39.4"
+    version: "0.39.8"
  archive:
    dependency: transitive
    description:
      name: archive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
  args:
    dependency: transitive
    description:
      name: args
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.2"
+    version: "1.6.0"
  async:
    dependency: transitive
    description:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
  bloc:
    dependency: "direct main"
    description:
      name: bloc
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.0"
+    version: "4.0.0"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.5"
+    version: "2.0.0"
  charcode:
    dependency: transitive
    description:
      name: charcode
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.2"
+    version: "1.1.3"
  collection:
    dependency: transitive
    description:
      name: collection
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
  convert:
    dependency: transitive
    description:
@ -77,7 +77,7 @@ packages:
      name: crypto
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
  csslib:
    dependency: transitive
    description:
@ -98,7 +98,7 @@ packages:
      name: dart_style
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.3"
+    version: "1.3.6"
  equatable:
    dependency: "direct main"
    description:
@ -117,7 +117,7 @@ packages:
      name: flutter_bloc
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
  flutter_localizations:
    dependency: "direct main"
    description: flutter
@ -129,14 +129,14 @@ packages:
      name: flutter_markdown
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.3.4"
+    version: "0.3.5"
  flutter_svg:
    dependency: "direct main"
    description:
      name: flutter_svg
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.17.3+1"
+    version: "0.17.4"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -162,14 +162,14 @@ packages:
      name: image
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.12"
  intl:
    dependency: "direct main"
    description:
      name: intl
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.16.0"
+    version: "0.16.1"
  intl_translation:
    dependency: "direct main"
    description:
@ -218,21 +218,21 @@ packages:
      name: node_interop
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.3"
+    version: "1.1.1"
  node_io:
    dependency: transitive
    description:
      name: node_io
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1+2"
+    version: "1.1.1"
  package_config:
    dependency: transitive
    description:
      name: package_config
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.9.2"
+    version: "1.9.3"
  path:
    dependency: "direct main"
    description:
@ -260,7 +260,7 @@ packages:
      name: pedantic
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.0+1"
+    version: "1.9.0"
  petitparser:
    dependency: transitive
    description:
@ -274,7 +274,7 @@ packages:
      name: provider
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.0.4"
+    version: "4.1.1"
  pub_semver:
    dependency: transitive
    description:
@ -288,21 +288,14 @@ packages:
      name: quiver
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
  rxdart:
    dependency: transitive
    description:
      name: rxdart
      url: "https://pub.dartlang.org"
    source: hosted
    version: "0.23.1"
  sembast:
    dependency: "direct main"
    description:
      name: sembast
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.3.0"
+    version: "2.4.4"
  sky_engine:
    dependency: transitive
    description: flutter
@ -314,21 +307,21 @@ packages:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.5"
+    version: "1.7.0"
  sqflite:
    dependency: "direct main"
    description:
      name: sqflite
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.0"
+    version: "1.3.0+1"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.0+1"
+    version: "1.0.1"
  stack_trace:
    dependency: transitive
    description:
@ -370,7 +363,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.11"
+    version: "0.2.15"
  typed_data:
    dependency: transitive
    description:
@ -391,21 +384,21 @@ packages:
      name: watcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.9.7+14"
+    version: "0.9.7+15"
  xml:
    dependency: transitive
    description:
      name: xml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.5.0"
+    version: "3.6.1"
  yaml:
    dependency: transitive
    description:
      name: yaml
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
 sdks:
  dart: ">=2.7.0 <3.0.0"
-  flutter: ">=1.12.13+hotfix.8 <2.0.0"
+  flutter: ">=1.17.0 <2.0.0"
--- a/aidedejeu_flutter/pubspec.yaml
+++ b/aidedejeu_flutter/pubspec.yaml
@ -14,8 +14,8 @@ description: Haches & Dés version flutter
 version: 1.0.0+1
 environment:
-  sdk: ">=2.2.0 <3.0.0"
+  sdk: ">=2.3.0 <3.0.0"
-  flutter: ^1.12.13+hotfix.8
+  flutter: ^1.17.0
 dependencies:
  flutter:
@ -27,13 +27,13 @@ dependencies:
  flutter_markdown:
  sqflite:
  sembast:
-# sembast_web:
+  # sembast_web:
  path:
  flutter_svg:
  bloc:
  flutter_bloc:
-  cupertino_icons: ^0.1.2
+  cupertino_icons: # ^0.1.2
-  equatable: ^1.0.0
+  equatable: # ^1.0.0
 dev_dependencies:
  flutter_test: