From 6cb8e119c09d72d399b28ea454fa5ad1edb458ec Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 10 Apr 2017 20:31:04 +0200
Subject: [PATCH] newtonsoft ...

---
 ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj |  9 +++---
 ZicMoove/ZicMoove.Droid/app.config            |  2 +-
 ZicMoove/ZicMoove.Droid/packages.config       | 30 +++++++++++++++++--
 ZicMoove/ZicMoove.iOS/ZicMoove.iOS.csproj     | 16 +++++-----
 ZicMoove/ZicMoove.iOS/app.config              |  2 +-
 ZicMoove/ZicMoove.iOS/packages.config         |  4 +--
 ZicMoove/ZicMoove/App.xaml.cs                 |  4 +--
 ZicMoove/ZicMoove/ZicMoove.csproj             | 28 ++++++++---------
 ZicMoove/ZicMoove/app.config                  |  2 +-
 ZicMoove/ZicMoove/packages.config             |  8 ++---
 10 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj b/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
index 21e18e8b..6d8bd499 100644
--- a/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
+++ b/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
@@ -176,10 +176,11 @@
     <Reference Include="GoogleMediaFramework">
       <HintPath>..\..\Components\GoogleMediaFramework-1.0\lib\android\GoogleMediaFramework.dll</HintPath>
     </Reference>
-    <Reference Include="MarkdownDeep, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MarkdownDeep-av.NET.1.5.2\lib\MonoAndroid10\MarkdownDeep.dll</HintPath>
+    <Reference Include="MarkdownDeep, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MarkdownDeep-av.NET.1.5.4\lib\MonoAndroid10\MarkdownDeep.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v7.0\Mono.Android.dll</HintPath>
@@ -190,8 +191,8 @@
     </Reference>
     <Reference Include="Mono.Data.Sqlite" />
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.1\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Plugin.Connectivity, Version=2.2.12.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/ZicMoove/ZicMoove.Droid/app.config b/ZicMoove/ZicMoove.Droid/app.config
index c8df8462..9b4ce5e9 100644
--- a/ZicMoove/ZicMoove.Droid/app.config
+++ b/ZicMoove/ZicMoove.Droid/app.config
@@ -28,7 +28,7 @@
 			</dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Drawing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
diff --git a/ZicMoove/ZicMoove.Droid/packages.config b/ZicMoove/ZicMoove.Droid/packages.config
index 9c0a8475..da3dee02 100644
--- a/ZicMoove/ZicMoove.Droid/packages.config
+++ b/ZicMoove/ZicMoove.Droid/packages.config
@@ -2,9 +2,10 @@
 <packages>
   <package id="ExifLib.PCL" version="1.0.1" targetFramework="monoandroid70" />
   <package id="Kobush.Build" version="2.2.0.0" targetFramework="monoandroid70" />
-  <package id="MarkdownDeep-av.NET" version="1.5.2" targetFramework="monoandroid60" />
+  <package id="MarkdownDeep-av.NET" version="1.5.4" targetFramework="monoandroid70" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid70" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
+  <package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="monoandroid70" />
   <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid70" />
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid70" />
   <package id="Plugin.Share" version="3.0.1" targetFramework="monoandroid70" />
@@ -15,6 +16,31 @@
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="Square.OkHttp3" version="3.4.1.1" targetFramework="monoandroid70" />
   <package id="Square.OkIO" version="1.6.0.0" targetFramework="monoandroid70" />
+  <package id="System.Collections" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.IO" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Linq" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Threading" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid70" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid70" />
   <package id="Xam.PayPal.Droid" version="2.15.1.1" targetFramework="monoandroid70" />
   <package id="Xam.Plugin.Connectivity" version="2.2.12" targetFramework="monoandroid70" />
   <package id="Xam.Plugin.DeviceInfo" version="2.0.2" targetFramework="monoandroid70" />
diff --git a/ZicMoove/ZicMoove.iOS/ZicMoove.iOS.csproj b/ZicMoove/ZicMoove.iOS/ZicMoove.iOS.csproj
index 67a73a13..86b4d40e 100644
--- a/ZicMoove/ZicMoove.iOS/ZicMoove.iOS.csproj
+++ b/ZicMoove/ZicMoove.iOS/ZicMoove.iOS.csproj
@@ -207,27 +207,27 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Maps.iOS.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.iOS" />
@@ -251,11 +251,11 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/ZicMoove/ZicMoove.iOS/app.config b/ZicMoove/ZicMoove.iOS/app.config
index bb76392c..156067f8 100644
--- a/ZicMoove/ZicMoove.iOS/app.config
+++ b/ZicMoove/ZicMoove.iOS/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="XLabs.Serialization" publicKeyToken="d65109b36e5040e4" culture="neutral" />
diff --git a/ZicMoove/ZicMoove.iOS/packages.config b/ZicMoove/ZicMoove.iOS/packages.config
index fa5dcff1..03470919 100644
--- a/ZicMoove/ZicMoove.iOS/packages.config
+++ b/ZicMoove/ZicMoove.iOS/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms.Maps" version="2.3.3.193" targetFramework="xamarinios10" />
   <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="xamarinios10" />
   <package id="XLabs.Serialization" version="2.3.0-pre02" targetFramework="xamarinios10" />
   <package id="XLabs.Settings" version="2.3.0-pre02" targetFramework="xamarinios10" />
diff --git a/ZicMoove/ZicMoove/App.xaml.cs b/ZicMoove/ZicMoove/App.xaml.cs
index 8fb19cc4..517c8a6c 100644
--- a/ZicMoove/ZicMoove/App.xaml.cs
+++ b/ZicMoove/ZicMoove/App.xaml.cs
@@ -63,7 +63,6 @@ namespace ZicMoove
         public void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
-
             if (app == null)
             {
                 return;
@@ -172,7 +171,6 @@ namespace ZicMoove
             ViewFactory.Register<EditBillingLinePage, BillingLineViewModel>();
             ViewFactory.Register<EditEstimatePage, EditEstimateViewModel>();
             ViewFactory.Register<UserFiles, DirectoryInfoViewModel>();
-            ViewFactory.Register<UserProfilePage, UserProfileViewModel>();
             ViewFactory.Register<EstimateSigningPage, EditEstimateViewModel>();
             ConfigManager = new GenericConfigSettingsMgr(s =>
            MainSettings.AppSettings.GetValueOrDefault<string>(s, MainSettings.SettingsDefault), null);
@@ -233,7 +231,7 @@ namespace ZicMoove
 
             var bookQueries = new BookQueriesViewModel();
 
-            var userprofile = new UserProfileViewModel();
+            var userprofile = Resolver.Resolve<UserProfileViewModel>();
 
             bQueriesPage = new BookQueriesPage
             {
diff --git a/ZicMoove/ZicMoove/ZicMoove.csproj b/ZicMoove/ZicMoove/ZicMoove.csproj
index d4b228d4..6f2b49c7 100644
--- a/ZicMoove/ZicMoove/ZicMoove.csproj
+++ b/ZicMoove/ZicMoove/ZicMoove.csproj
@@ -286,7 +286,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
+    <None Include="app.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="GettingStarted.Xamarin" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
@@ -331,8 +333,9 @@
     <Reference Include="Mono.Android">
       <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v7.0\Mono.Android.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.1\lib\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Plugin.Connectivity">
       <HintPath>..\..\packages\Xam.Plugin.Connectivity.2.2.12\lib\MonoAndroid10\Plugin.Connectivity.dll</HintPath>
@@ -392,19 +395,19 @@
       <HintPath>..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="XamForms.Controls.Calendar, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -603,18 +606,15 @@
     <Content Include="Helpers\CrossGeofenceListener.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/ZicMoove/ZicMoove/app.config b/ZicMoove/ZicMoove/app.config
index 179d6818..4e4de527 100644
--- a/ZicMoove/ZicMoove/app.config
+++ b/ZicMoove/ZicMoove/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="XLabs.Serialization" publicKeyToken="d65109b36e5040e4" culture="neutral" />
diff --git a/ZicMoove/ZicMoove/packages.config b/ZicMoove/ZicMoove/packages.config
index 7ba88733..5039defc 100644
--- a/ZicMoove/ZicMoove/packages.config
+++ b/ZicMoove/ZicMoove/packages.config
@@ -5,17 +5,17 @@
   <package id="MarkdownDeep.NET" version="1.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Microsoft.AspNet.SignalR.Client" version="2.2.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Softlion.XamSvg.Free" version="2.3.2.5" targetFramework="portable45-net45+win8+wpa81" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugin.Geofence" version="1.1.2" targetFramework="portable45-net45+win8+wpa81" developmentDependency="true" />
   <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xamarin.Controls.SignaturePad.Forms" version="1.4.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.3.193" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms.Maps" version="2.3.3.193" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XamForms.Controls.Calendar" version="1.0.7" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Caching" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Core" version="2.3.0-pre02" targetFramework="portable45-net45+win8+wpa81" />