From b0e17f3cce9399ce1370c868384e89fcaf5a06dc Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 29 Jul 2019 01:33:56 +0200
Subject: [PATCH] Rollback EFCore

---
 .../AideDeJeu.Android.csproj                  | 11 ++++++----
 AideDeJeu/AideDeJeu.Android/linker.xml        | 20 +++++++++++++++++++
 AideDeJeu/AideDeJeu/AideDeJeu.csproj          |  4 ++--
 AideDeJeu/AideDeJeu/Models/Items/Item.cs      |  1 +
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 AideDeJeu/AideDeJeu.Android/linker.xml

diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
index bc44b083..846110f3 100644
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@@ -25,7 +25,7 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidSupportedAbis />
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <AotAssemblies>false</AotAssemblies>
@@ -50,8 +50,11 @@
     <AotAssemblies>false</AotAssemblies>
     <EnableLLVM>false</EnableLLVM>
     <BundleAssemblies>false</BundleAssemblies>
-    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
+    <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
+    <AndroidDexTool>d8</AndroidDexTool>
+    <AndroidLinkTool>r8</AndroidLinkTool>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -62,10 +65,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore">
-      <Version>2.2.6</Version>
+      <Version>2.0.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core">
-      <Version>2.2.6</Version>
+      <Version>2.0.3</Version>
     </PackageReference>
     <PackageReference Include="Rg.Plugins.Popup">
       <Version>1.1.5.188</Version>
diff --git a/AideDeJeu/AideDeJeu.Android/linker.xml b/AideDeJeu/AideDeJeu.Android/linker.xml
new file mode 100644
index 00000000..bbb85339
--- /dev/null
+++ b/AideDeJeu/AideDeJeu.Android/linker.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+  <assembly fullname="mscorlib">
+    <type fullname="System.Environment">
+      <field name="mono_corlib_version" />
+      <method name="get_StackTrace" />
+    </type>
+  </assembly>
+  <assembly fullname="My.Own.Assembly">
+    <type fullname="Foo" preserve="fields">
+      <method name=".ctor" />
+    </type>
+    <type fullname="Bar">
+      <method signature="System.Void .ctor(System.String)" />
+      <field signature="System.String _blah" />
+    </type>
+    <namespace fullname="My.Own.Namespace" />
+    <type fullname="My.Other*" />
+  </assembly>
+</linker>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index 1f9f995f..7f5c4a23 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -88,8 +88,8 @@
 
   <ItemGroup>
     <PackageReference Include="Markdig" Version="0.17.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
+    <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.1.5.188" />
     <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
diff --git a/AideDeJeu/AideDeJeu/Models/Items/Item.cs b/AideDeJeu/AideDeJeu/Models/Items/Item.cs
index c80095ac..4ecf7391 100644
--- a/AideDeJeu/AideDeJeu/Models/Items/Item.cs
+++ b/AideDeJeu/AideDeJeu/Models/Items/Item.cs
@@ -23,6 +23,7 @@ namespace AideDeJeuLib
     {
 
     }
+    [Preserve(AllMembers = true)]
     [DataContract]
     public class Item : IItem //: IList<Item>
     {