From 17eea70c4ad436de112cf5d578de95edb0e38a9b Mon Sep 17 00:00:00 2001
From: Madugula Venkataramana <madugula.venkataramana@gmail.com>
Date: Sun, 13 Aug 2017 15:49:03 +0530
Subject: [PATCH] Removed local usage of dlls Made use of nuget packages Made
 use of RegisterNavigationServiceAppStart

---
 .../MoreControls/MoreControls.Core/App.cs     |  7 +-
 .../MoreControls.Core.csproj                  | 25 +++----
 .../ToDo-MvvmCross/_ Core.txt                 | 23 ------
 .../ViewModels/FirstViewModel.cs              |  2 +-
 .../MoreControls.Core/packages.config         | 12 ++--
 .../MoreControls.Droid/Controls/ShapeView.cs  |  2 +-
 .../MoreControls.Droid/DebugTrace.cs          |  2 +-
 .../MoreControls.Droid.csproj                 | 63 ++++++----------
 .../Resources/Resource.Designer.cs            | 72 ++++++++++++++-----
 .../MoreControls/MoreControls.Droid/Setup.cs  |  4 +-
 .../MoreControls.Droid/SplashScreen.cs        | 42 +++++------
 .../MoreControls.Droid/Views/FirstView.cs     | 32 ++++-----
 .../MoreControls.Droid/packages.config        | 12 ++--
 13 files changed, 144 insertions(+), 154 deletions(-)
 delete mode 100644 OldSamples/MoreControls/MoreControls.Core/ToDo-MvvmCross/_ Core.txt

diff --git a/OldSamples/MoreControls/MoreControls.Core/App.cs b/OldSamples/MoreControls/MoreControls.Core/App.cs
index 5da3d221..46729b6a 100644
--- a/OldSamples/MoreControls/MoreControls.Core/App.cs
+++ b/OldSamples/MoreControls/MoreControls.Core/App.cs
@@ -1,8 +1,9 @@
-using Cirrious.CrossCore.IoC;
+using MvvmCross.Core.ViewModels;
+using MvvmCross.Platform.IoC;
 
 namespace MoreControls.Core
 {
-    public class App : Cirrious.MvvmCross.ViewModels.MvxApplication
+    public class App : MvxApplication
     {
         public override void Initialize()
         {
@@ -11,7 +12,7 @@ public override void Initialize()
                 .AsInterfaces()
                 .RegisterAsLazySingleton();
 
-            RegisterAppStart<ViewModels.FirstViewModel>();
+            RegisterNavigationServiceAppStart<ViewModels.FirstViewModel>();
         }
     }
 }
\ No newline at end of file
diff --git a/OldSamples/MoreControls/MoreControls.Core/MoreControls.Core.csproj b/OldSamples/MoreControls/MoreControls.Core/MoreControls.Core.csproj
index 407cc027..0801dc07 100644
--- a/OldSamples/MoreControls/MoreControls.Core/MoreControls.Core.csproj
+++ b/OldSamples/MoreControls/MoreControls.Core/MoreControls.Core.csproj
@@ -39,28 +39,21 @@
     <Compile Include="ViewModels\Shape.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Cirrious.CrossCore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.CrossCore.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MvvmCross.Platform">
+      <HintPath>..\packages\MvvmCross.Platform.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Platform.dll</HintPath>
     </Reference>
-    <Reference Include="Cirrious.MvvmCross, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MvvmCross.Core">
+      <HintPath>..\packages\MvvmCross.Core.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Cirrious.MvvmCross.Binding, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.Binding.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.Binding.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MvvmCross.Binding">
+      <HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Binding.dll</HintPath>
     </Reference>
-    <Reference Include="Cirrious.MvvmCross.Localization, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\portable-win+net45+wp8+win8+wpa81\Cirrious.MvvmCross.Localization.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="MvvmCross.Localization">
+      <HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\portable-net45+win+wpa81+wp80\MvvmCross.Localization.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ToDo-MvvmCross\_ Core.txt" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OldSamples/MoreControls/MoreControls.Core/ToDo-MvvmCross/_ Core.txt b/OldSamples/MoreControls/MoreControls.Core/ToDo-MvvmCross/_ Core.txt
deleted file mode 100644
index fb61f9fe..00000000
--- a/OldSamples/MoreControls/MoreControls.Core/ToDo-MvvmCross/_ Core.txt	
+++ /dev/null
@@ -1,23 +0,0 @@
-The steps to get this Core project working are:
-
-1. Create a ViewModels folder and add a ViewModel:
-
-    public class FirstViewModel : Cirrious.MvvmCross.ViewModels.MvxViewModel
-    {
-         public string Hello { get { return "Hello MvvmCross"; } }
-    }
-
-2. Add an App.cs class - in it place the code to start the app with the FirstViewModel:
-
-    public class App : Cirrious.MvvmCross.ViewModels.MvxApplication
-    {
-        public override void Initialize()
-        {
-            CreatableTypes()
-                .EndingWith("Service")
-                .AsInterfaces()
-                .RegisterAsLazySingleton();
-	
-            RegisterAppStart<ViewModels.FirstViewModel>();
-        }
-    }
diff --git a/OldSamples/MoreControls/MoreControls.Core/ViewModels/FirstViewModel.cs b/OldSamples/MoreControls/MoreControls.Core/ViewModels/FirstViewModel.cs
index 3cbbab2b..43d76e33 100644
--- a/OldSamples/MoreControls/MoreControls.Core/ViewModels/FirstViewModel.cs
+++ b/OldSamples/MoreControls/MoreControls.Core/ViewModels/FirstViewModel.cs
@@ -1,5 +1,5 @@
-using Cirrious.MvvmCross.ViewModels;
 using System.Collections.Generic;
+using MvvmCross.Core.ViewModels;
 
 namespace MoreControls.Core.ViewModels
 {
diff --git a/OldSamples/MoreControls/MoreControls.Core/packages.config b/OldSamples/MoreControls/MoreControls.Core/packages.config
index ee0e61a3..1de3103f 100644
--- a/OldSamples/MoreControls/MoreControls.Core/packages.config
+++ b/OldSamples/MoreControls/MoreControls.Core/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MvvmCross" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="MvvmCross.HotTuna.StarterPack" version="4.0.0-beta3" targetFramework="portable45-net45+win8+wp8+wpa81" />
-  <package id="MvvmCross.PortableSupport" version="3.0.13-beta4" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
+  <package id="MvvmCross" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="MvvmCross.Binding" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="MvvmCross.Core" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="MvvmCross.Platform" version="5.1.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="MvvmCross.PortableSupport" version="3.5.2-alpha2" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="MvvmCross.StarterPack" version="4.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
\ No newline at end of file
diff --git a/OldSamples/MoreControls/MoreControls.Droid/Controls/ShapeView.cs b/OldSamples/MoreControls/MoreControls.Droid/Controls/ShapeView.cs
index 3ebb9107..876ffaa4 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/Controls/ShapeView.cs
+++ b/OldSamples/MoreControls/MoreControls.Droid/Controls/ShapeView.cs
@@ -3,7 +3,7 @@
 using Android.Graphics;
 using Android.Util;
 using Android.Views;
-using Cirrious.MvvmCross.Binding.Droid.Views;
+using MvvmCross.Binding.Droid.Views;
 using MoreControls.Core.ViewModels;
 
 namespace MoreControls.Droid.Controls
diff --git a/OldSamples/MoreControls/MoreControls.Droid/DebugTrace.cs b/OldSamples/MoreControls/MoreControls.Droid/DebugTrace.cs
index 3f993352..053e8ecb 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/DebugTrace.cs
+++ b/OldSamples/MoreControls/MoreControls.Droid/DebugTrace.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Diagnostics;
-using Cirrious.CrossCore.Platform;
+using MvvmCross.Platform.Platform;
 
 namespace MoreControls.Droid
 {
diff --git a/OldSamples/MoreControls/MoreControls.Droid/MoreControls.Droid.csproj b/OldSamples/MoreControls/MoreControls.Droid/MoreControls.Droid.csproj
index 815624e4..e4213210 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/MoreControls.Droid.csproj
+++ b/OldSamples/MoreControls/MoreControls.Droid/MoreControls.Droid.csproj
@@ -41,52 +41,33 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Cirrious.CrossCore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Cirrious.CrossCore.Droid, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.CrossCore.Droid.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Cirrious.MvvmCross, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Cirrious.MvvmCross.Binding, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.Binding.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Binding.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Cirrious.MvvmCross.Binding.Droid, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.Binding.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Binding.Droid.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Cirrious.MvvmCross.Droid, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Droid.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Cirrious.MvvmCross.Localization, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\MvvmCross.HotTuna.CrossCore.4.0.0-beta3\lib\MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="Mono.Android.Export" />
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net">
-      <Private>True</Private>
-      <HintPath>..\packages\MvvmCross.PortableSupport.3.0.13-beta4\lib\MonoAndroid16\System.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows">
-      <Private>True</Private>
-      <HintPath>..\packages\MvvmCross.PortableSupport.3.0.13-beta4\lib\MonoAndroid16\System.Windows.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Serialization">
-      <Private>True</Private>
-      <HintPath>..\packages\MvvmCross.PortableSupport.3.0.13-beta4\lib\MonoAndroid16\System.Xml.Serialization.dll</HintPath>
+    <Reference Include="MvvmCross.Platform">
+      <HintPath>..\packages\MvvmCross.Platform.5.1.1\lib\MonoAndroid\MvvmCross.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross.Platform.Droid">
+      <HintPath>..\packages\MvvmCross.Platform.5.1.1\lib\MonoAndroid\MvvmCross.Platform.Droid.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross.Core">
+      <HintPath>..\packages\MvvmCross.Core.5.1.1\lib\MonoAndroid\MvvmCross.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross.Droid">
+      <HintPath>..\packages\MvvmCross.Core.5.1.1\lib\MonoAndroid\MvvmCross.Droid.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross.Binding">
+      <HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\MonoAndroid\MvvmCross.Binding.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross.Binding.Droid">
+      <HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\MonoAndroid\MvvmCross.Binding.Droid.dll</HintPath>
+    </Reference>
+    <Reference Include="MvvmCross.Localization">
+      <HintPath>..\packages\MvvmCross.Binding.5.1.1\lib\MonoAndroid\MvvmCross.Localization.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -96,15 +77,15 @@
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Setup.cs" />
-    <Compile Include="SplashScreen.cs" />
     <Compile Include="Views\FirstView.cs" />
+    <Compile Include="SplashScreen.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
     <AndroidResource Include="Resources\Layout\FirstView.axml" />
     <AndroidResource Include="Resources\Layout\SplashScreen.axml" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\Values\Strings.xml" />
diff --git a/OldSamples/MoreControls/MoreControls.Droid/Resources/Resource.Designer.cs b/OldSamples/MoreControls/MoreControls.Droid/Resources/Resource.Designer.cs
index 5686345d..d7a9a419 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/Resources/Resource.Designer.cs
+++ b/OldSamples/MoreControls/MoreControls.Droid/Resources/Resource.Designer.cs
@@ -1,15 +1,15 @@
 #pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18051
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 4.0.30319.42000
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
 
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("MoreControls.Droid.Resource", IsApplication=true)]
+[assembly: Android.Runtime.ResourceDesignerAttribute("MoreControls.Droid.Resource", IsApplication=true)]
 
 namespace MoreControls.Droid
 {
@@ -26,6 +26,27 @@ static Resource()
 		
 		public static void UpdateIdValues()
 		{
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxBind = global::MoreControls.Droid.Resource.Attribute.MvxBind;
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxDropDownItemTemplate = global::MoreControls.Droid.Resource.Attribute.MvxDropDownItemTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxGroupItemTemplate = global::MoreControls.Droid.Resource.Attribute.MvxGroupItemTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxItemTemplate = global::MoreControls.Droid.Resource.Attribute.MvxItemTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxLang = global::MoreControls.Droid.Resource.Attribute.MvxLang;
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxSource = global::MoreControls.Droid.Resource.Attribute.MvxSource;
+			global::MvvmCross.Binding.Droid.Resource.Attribute.MvxTemplate = global::MoreControls.Droid.Resource.Attribute.MvxTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Id.MvvmCrossTagId = global::MoreControls.Droid.Resource.Id.MvvmCrossTagId;
+			global::MvvmCross.Binding.Droid.Resource.Id.MvxBindingTagUnique = global::MoreControls.Droid.Resource.Id.MvxBindingTagUnique;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxBinding = global::MoreControls.Droid.Resource.Styleable.MvxBinding;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxBinding_MvxBind = global::MoreControls.Droid.Resource.Styleable.MvxBinding_MvxBind;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxBinding_MvxLang = global::MoreControls.Droid.Resource.Styleable.MvxBinding_MvxLang;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxControl = global::MoreControls.Droid.Resource.Styleable.MvxControl;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxControl_MvxTemplate = global::MoreControls.Droid.Resource.Styleable.MvxControl_MvxTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxExpandableListView = global::MoreControls.Droid.Resource.Styleable.MvxExpandableListView;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxExpandableListView_MvxGroupItemTemplate = global::MoreControls.Droid.Resource.Styleable.MvxExpandableListView_MvxGroupItemTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxImageView = global::MoreControls.Droid.Resource.Styleable.MvxImageView;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxImageView_MvxSource = global::MoreControls.Droid.Resource.Styleable.MvxImageView_MvxSource;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxListView = global::MoreControls.Droid.Resource.Styleable.MvxListView;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxListView_MvxDropDownItemTemplate = global::MoreControls.Droid.Resource.Styleable.MvxListView_MvxDropDownItemTemplate;
+			global::MvvmCross.Binding.Droid.Resource.Styleable.MvxListView_MvxItemTemplate = global::MoreControls.Droid.Resource.Styleable.MvxListView_MvxItemTemplate;
 		}
 		
 		public partial class Attribute
@@ -37,14 +58,17 @@ public partial class Attribute
 			// aapt resource value: 0x7f010004
 			public const int MvxDropDownItemTemplate = 2130771972;
 			
+			// aapt resource value: 0x7f010005
+			public const int MvxGroupItemTemplate = 2130771973;
+			
 			// aapt resource value: 0x7f010003
 			public const int MvxItemTemplate = 2130771971;
 			
 			// aapt resource value: 0x7f010001
 			public const int MvxLang = 2130771969;
 			
-			// aapt resource value: 0x7f010005
-			public const int MvxSource = 2130771973;
+			// aapt resource value: 0x7f010006
+			public const int MvxSource = 2130771974;
 			
 			// aapt resource value: 0x7f010002
 			public const int MvxTemplate = 2130771970;
@@ -82,7 +106,10 @@ public partial class Id
 		{
 			
 			// aapt resource value: 0x7f040000
-			public const int MvxBindingTagUnique = 2130968576;
+			public const int MvvmCrossTagId = 2130968576;
+			
+			// aapt resource value: 0x7f040001
+			public const int MvxBindingTagUnique = 2130968577;
 			
 			static Id()
 			{
@@ -151,7 +178,8 @@ private Style()
 		public partial class Styleable
 		{
 			
-			public static int[] MvxBinding = new int[] {
+			public static int[] MvxBinding = new int[]
+			{
 					2130771968,
 					2130771969};
 			
@@ -161,19 +189,29 @@ public partial class Styleable
 			// aapt resource value: 1
 			public const int MvxBinding_MvxLang = 1;
 			
-			public static int[] MvxControl = new int[] {
+			public static int[] MvxControl = new int[]
+			{
 					2130771970};
 			
 			// aapt resource value: 0
 			public const int MvxControl_MvxTemplate = 0;
 			
-			public static int[] MvxImageView = new int[] {
+			public static int[] MvxExpandableListView = new int[]
+			{
 					2130771973};
 			
+			// aapt resource value: 0
+			public const int MvxExpandableListView_MvxGroupItemTemplate = 0;
+			
+			public static int[] MvxImageView = new int[]
+			{
+					2130771974};
+			
 			// aapt resource value: 0
 			public const int MvxImageView_MvxSource = 0;
 			
-			public static int[] MvxListView = new int[] {
+			public static int[] MvxListView = new int[]
+			{
 					2130771971,
 					2130771972};
 			
diff --git a/OldSamples/MoreControls/MoreControls.Droid/Setup.cs b/OldSamples/MoreControls/MoreControls.Droid/Setup.cs
index 4c72745d..f4f1f989 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/Setup.cs
+++ b/OldSamples/MoreControls/MoreControls.Droid/Setup.cs
@@ -1,7 +1,7 @@
 using Android.Content;
-using Cirrious.MvvmCross.Droid.Platform;
-using Cirrious.MvvmCross.ViewModels;
 using System.Collections.Generic;
+using MvvmCross.Droid.Platform;
+using MvvmCross.Core.ViewModels;
 
 namespace MoreControls.Droid
 {
diff --git a/OldSamples/MoreControls/MoreControls.Droid/SplashScreen.cs b/OldSamples/MoreControls/MoreControls.Droid/SplashScreen.cs
index 17f8a43b..d06b3c2b 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/SplashScreen.cs
+++ b/OldSamples/MoreControls/MoreControls.Droid/SplashScreen.cs
@@ -1,21 +1,21 @@
-using Android.App;
-using Android.Content.PM;
-using Cirrious.MvvmCross.Droid.Views;
-
-namespace MoreControls.Droid
-{
-    [Activity(
-		Label = "MoreControls.Droid"
-		, MainLauncher = true
-		, Icon = "@drawable/icon"
-		, Theme = "@style/Theme.Splash"
-		, NoHistory = true
-		, ScreenOrientation = ScreenOrientation.Portrait)]
-    public class SplashScreen : MvxSplashScreenActivity
-    {
-        public SplashScreen()
-            : base(Resource.Layout.SplashScreen)
-        {
-        }
-    }
-}
\ No newline at end of file
+using Android.App;
+using Android.Content.PM;
+using MvvmCross.Droid.Views;
+
+namespace MoreControls.Droid
+{
+    [Activity(
+        Label = "MoreControls.Droid"
+        , MainLauncher = true
+        , Icon = "@drawable/icon"
+        , Theme = "@style/Theme.Splash"
+        , NoHistory = true
+        , ScreenOrientation = ScreenOrientation.Portrait)]
+    public class SplashScreen : MvxSplashScreenActivity
+    {
+        public SplashScreen()
+            : base(Resource.Layout.SplashScreen)
+        {
+        }
+    }
+}
diff --git a/OldSamples/MoreControls/MoreControls.Droid/Views/FirstView.cs b/OldSamples/MoreControls/MoreControls.Droid/Views/FirstView.cs
index 1d5a39cc..06980f2f 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/Views/FirstView.cs
+++ b/OldSamples/MoreControls/MoreControls.Droid/Views/FirstView.cs
@@ -1,16 +1,16 @@
-using Android.App;
-using Android.OS;
-using Cirrious.MvvmCross.Droid.Views;
-
-namespace MoreControls.Droid.Views
-{
-    [Activity(Label = "View for FirstViewModel")]
-    public class FirstView : MvxActivity
-    {
-        protected override void OnCreate(Bundle bundle)
-        {
-            base.OnCreate(bundle);
-            SetContentView(Resource.Layout.FirstView);
-        }
-    }
-}
\ No newline at end of file
+using Android.App;
+using Android.OS;
+using MvvmCross.Droid.Views;
+
+namespace MoreControls.Droid.Views
+{
+    [Activity(Label = "View for FirstViewModel")]
+    public class FirstView : MvxActivity
+    {
+        protected override void OnCreate(Bundle bundle)
+        {
+            base.OnCreate(bundle);
+            SetContentView(Resource.Layout.FirstView);
+        }
+    }
+}
diff --git a/OldSamples/MoreControls/MoreControls.Droid/packages.config b/OldSamples/MoreControls/MoreControls.Droid/packages.config
index 93744709..3eb5811a 100644
--- a/OldSamples/MoreControls/MoreControls.Droid/packages.config
+++ b/OldSamples/MoreControls/MoreControls.Droid/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MvvmCross" version="4.0.0-beta3" targetFramework="monoandroid23" />
-  <package id="MvvmCross.HotTuna.Binding" version="4.0.0-beta3" targetFramework="monoandroid5" />
-  <package id="MvvmCross.HotTuna.CrossCore" version="4.0.0-beta3" targetFramework="monoandroid23" />
-  <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="4.0.0-beta3" targetFramework="monoandroid23" />
-  <package id="MvvmCross.HotTuna.StarterPack" version="4.0.0-beta3" targetFramework="monoandroid23" />
-  <package id="MvvmCross.PortableSupport" version="3.0.13-beta4" targetFramework="MonoAndroid22" />
+  <package id="MvvmCross" version="5.1.1" targetFramework="monoandroid50" />
+  <package id="MvvmCross.Binding" version="5.1.1" targetFramework="monoandroid50" />
+  <package id="MvvmCross.Core" version="5.1.1" targetFramework="monoandroid50" />
+  <package id="MvvmCross.Platform" version="5.1.1" targetFramework="monoandroid50" />
+  <package id="MvvmCross.PortableSupport" version="3.5.2-alpha2" targetFramework="monoandroid50" />
+  <package id="MvvmCross.StarterPack" version="4.0.0" targetFramework="monoandroid50" />
 </packages>
\ No newline at end of file