From 2000fc12e49b014131129d41b3f46211eef21c37 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Wed, 23 May 2018 23:15:44 +0200
Subject: [PATCH] Suppression AideDeJeuLib

---
 AideDeJeu.sln                                 | 52 +------------------
 .../AideDeJeu.Android.csproj                  |  2 +-
 AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj  |  2 +-
 AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj  |  8 +--
 AideDeJeu/AideDeJeu/AideDeJeu.csproj          |  8 +--
 .../Models}/Cards/Cards.cs                    |  0
 .../Models}/Cards/Converters.cs               |  0
 .../Models}/Item.cs                           |  0
 .../Models}/Monsters/Monster.cs               |  0
 .../Models}/Monsters/MonstersScrappers.cs     |  0
 .../Models}/Spells/Spell.cs                   |  0
 .../Models}/Spells/SpellsScrappers.cs         |  0
 AideDeJeu/AideDeJeuLib/AideDeJeuLib.csproj    | 11 ----
 AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj    |  4 --
 14 files changed, 7 insertions(+), 80 deletions(-)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Cards/Cards.cs (100%)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Cards/Converters.cs (100%)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Item.cs (100%)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Monsters/Monster.cs (100%)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Monsters/MonstersScrappers.cs (100%)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Spells/Spell.cs (100%)
 rename AideDeJeu/{AideDeJeuLib => AideDeJeu/Models}/Spells/SpellsScrappers.cs (100%)
 delete mode 100644 AideDeJeu/AideDeJeuLib/AideDeJeuLib.csproj

diff --git a/AideDeJeu.sln b/AideDeJeu.sln
index 2baf1ebe..a81e28ac 100644
--- a/AideDeJeu.sln
+++ b/AideDeJeu.sln
@@ -11,11 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AideDeJeu.UWP", "AideDeJeu\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AideDeJeu", "AideDeJeu\AideDeJeu\AideDeJeu.csproj", "{C0597D88-5C09-4314-80A3-64712B02D0E9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AideDeJeuLib", "AideDeJeu\AideDeJeuLib\AideDeJeuLib.csproj", "{948BB32D-BAB8-485D-8A6F-BE5391E824A3}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AideDeJeuWeb", "AideDeJeu\AideDeJeuWeb\AideDeJeuWeb.csproj", "{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AideDeJeuCmd", "AideDeJeu\AideDeJeuCmd\AideDeJeuCmd.csproj", "{9DDAEA8E-7B4F-4CC1-80FC-0D511D230689}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AideDeJeuCmd", "AideDeJeu\AideDeJeuCmd\AideDeJeuCmd.csproj", "{9DDAEA8E-7B4F-4CC1-80FC-0D511D230689}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C0597D88-5C09-4314-80A3-64712B02D0E9} = {C0597D88-5C09-4314-80A3-64712B02D0E9}
 	EndProjectSection
@@ -260,54 +258,6 @@ Global
 		{C0597D88-5C09-4314-80A3-64712B02D0E9}.Release|x64.Build.0 = Release|Any CPU
 		{C0597D88-5C09-4314-80A3-64712B02D0E9}.Release|x86.ActiveCfg = Release|Any CPU
 		{C0597D88-5C09-4314-80A3-64712B02D0E9}.Release|x86.Build.0 = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|x64.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.AppStore|x86.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|ARM.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|x64.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Debug|x86.Build.0 = Debug|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|ARM.ActiveCfg = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|ARM.Build.0 = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|iPhone.Build.0 = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|x64.ActiveCfg = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|x64.Build.0 = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|x86.ActiveCfg = Release|Any CPU
-		{948BB32D-BAB8-485D-8A6F-BE5391E824A3}.Release|x86.Build.0 = Release|Any CPU
 		{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{D5065DC7-7B51-4D25-8FA5-DDF0F3E6FCE4}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
index d0763f7f..c99aebbc 100644
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.60.0</Version>
+      <Version>1.60.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
       <Version>3.0.0.482510</Version>
diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
index 0b224120..7b5bea6d 100644
--- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
+++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
@@ -170,7 +170,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.60.0</Version>
+      <Version>1.60.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.4" />
     <PackageReference Include="Xamarin.Forms">
diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
index 8fdab39e..7c6b06e1 100644
--- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
+++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SkiaSharp.Views.Forms">
-      <Version>1.60.0</Version>
+      <Version>1.60.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms">
       <Version>3.0.0.482510</Version>
@@ -150,10 +150,6 @@
       <Project>{C0597D88-5C09-4314-80A3-64712B02D0E9}</Project>
       <Name>AideDeJeu</Name>
     </ProjectReference>
-    <ProjectReference Include="..\AideDeJeuLib\AideDeJeuLib.csproj">
-      <Project>{948BB32D-BAB8-485D-8A6F-BE5391E824A3}</Project>
-      <Name>AideDeJeuLib</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Media.xcassets\Contents.json">
@@ -227,9 +223,9 @@
     </ImageAsset>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Media.xcassets\dragon_head.imageset\" />
     <Folder Include="Media.xcassets\icon.imageset\" />
     <Folder Include="Media.xcassets\spell_book.imageset\" />
-    <Folder Include="Media.xcassets\dragon_head.imageset\" />
     <Folder Include="Media.xcassets\wooden_sign.imageset\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index 65024dcb..9e3600c8 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -30,14 +30,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.8.2" />
+    <PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.1" />
     <PackageReference Include="Xamarin.Forms" Version="3.0.0.482510" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\AideDeJeuLib\AideDeJeuLib.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Views\AboutPage.xaml.cs">
       <SubType>Code</SubType>
@@ -54,7 +51,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Models\" />
     <Folder Include="Services\" />
   </ItemGroup>
 
diff --git a/AideDeJeu/AideDeJeuLib/Cards/Cards.cs b/AideDeJeu/AideDeJeu/Models/Cards/Cards.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Cards/Cards.cs
rename to AideDeJeu/AideDeJeu/Models/Cards/Cards.cs
diff --git a/AideDeJeu/AideDeJeuLib/Cards/Converters.cs b/AideDeJeu/AideDeJeu/Models/Cards/Converters.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Cards/Converters.cs
rename to AideDeJeu/AideDeJeu/Models/Cards/Converters.cs
diff --git a/AideDeJeu/AideDeJeuLib/Item.cs b/AideDeJeu/AideDeJeu/Models/Item.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Item.cs
rename to AideDeJeu/AideDeJeu/Models/Item.cs
diff --git a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs b/AideDeJeu/AideDeJeu/Models/Monsters/Monster.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
rename to AideDeJeu/AideDeJeu/Models/Monsters/Monster.cs
diff --git a/AideDeJeu/AideDeJeuLib/Monsters/MonstersScrappers.cs b/AideDeJeu/AideDeJeu/Models/Monsters/MonstersScrappers.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Monsters/MonstersScrappers.cs
rename to AideDeJeu/AideDeJeu/Models/Monsters/MonstersScrappers.cs
diff --git a/AideDeJeu/AideDeJeuLib/Spells/Spell.cs b/AideDeJeu/AideDeJeu/Models/Spells/Spell.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Spells/Spell.cs
rename to AideDeJeu/AideDeJeu/Models/Spells/Spell.cs
diff --git a/AideDeJeu/AideDeJeuLib/Spells/SpellsScrappers.cs b/AideDeJeu/AideDeJeu/Models/Spells/SpellsScrappers.cs
similarity index 100%
rename from AideDeJeu/AideDeJeuLib/Spells/SpellsScrappers.cs
rename to AideDeJeu/AideDeJeu/Models/Spells/SpellsScrappers.cs
diff --git a/AideDeJeu/AideDeJeuLib/AideDeJeuLib.csproj b/AideDeJeu/AideDeJeuLib/AideDeJeuLib.csproj
deleted file mode 100644
index f3145cfb..00000000
--- a/AideDeJeu/AideDeJeuLib/AideDeJeuLib.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.8.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
index a1a0508f..223f2122 100644
--- a/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
+++ b/AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
@@ -16,8 +16,4 @@
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\AideDeJeuLib\AideDeJeuLib.csproj" />
-  </ItemGroup>
-
 </Project>