Merge pull request #183 from dotnet-architecture/xamarin

Bumped Forms version from 2.3.3 to 2.3.4 + more tidy up.

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml

@@ -134,6 +134,8 @@
                         Value="FillAndExpand" />
                 <Setter Property="FontAttributes"
                         Value="Bold" />
+				<Setter Property="BackgroundColor" 
+                        Value="Transparent" />
                 <Setter Property="Opacity"
                         Value="0.6" />
                 <Setter Property="behaviors:LineColorBehavior.ApplyLineColor"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -263,11 +263,11 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
+      <ErrorText>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=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\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.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.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">

src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json

@@ -1,21 +1,20 @@
 {
   "dependencies": {
     "Acr.UserDialogs": "6.3.3",
-    "Autofac": "4.4.0",
-    "CommonServiceLocator": "1.3",
+    "Autofac": "4.5.0",
     "IdentityModel": "1.3.1",
     "Microsoft.Bcl": "1.1.10",
     "Microsoft.Bcl.Build": "1.0.21",
     "Microsoft.Net.Http": "2.2.29",
     "modernhttpclient": "2.4.2",
-    "Newtonsoft.Json": "9.0.2-beta1",
+    "Newtonsoft.Json": "9.0.1",
     "SlideOverKit": "2.1.4",
     "Splat": "1.6.2",
     "Xam.Plugins.Settings": "2.6.0.12-beta",
     "Xamarin.FFImageLoading": "2.2.6-pre-256",
     "Xamarin.FFImageLoading.Forms": "2.2.6-pre-256",
-    "Xamarin.Forms": "2.3.3.175",
-    "Xamarin.Forms.Pages": "2.3.3.175",
+    "Xamarin.Forms": "2.3.4.231",
+    "Xamarin.Forms.Pages": "2.3.4.231",
     "Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
     "Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"
   },

src/Mobile/eShopOnContainers/eShopOnContainers.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.42000
-//
-//     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("eShopOnContainers.Droid.Resource", IsApplication=true)]
+[assembly: Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.Droid.Resource", IsApplication=true)]
 
 namespace eShopOnContainers.Droid
 {
@@ -4388,7 +4388,8 @@ namespace eShopOnContainers.Droid
 		public partial class Styleable
 		{
 			
-			public static int[] ActionBar = new int[] {
+			public static int[] ActionBar = new int[]
+			{
 					2130772007,
 					2130772009,
 					2130772010,
@@ -4498,13 +4499,15 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 5
 			public const int ActionBar_titleTextStyle = 5;
 			
-			public static int[] ActionBarLayout = new int[] {
+			public static int[] ActionBarLayout = new int[]
+			{
 					16842931};
 			
 			// aapt resource value: 0
 			public const int ActionBarLayout_android_layout_gravity = 0;
 			
-			public static int[] ActionMenuItemView = new int[] {
+			public static int[] ActionMenuItemView = new int[]
+			{
 					16843071};
 			
 			// aapt resource value: 0
@@ -4512,7 +4515,8 @@ namespace eShopOnContainers.Droid
 			
 			public static int[] ActionMenuView;
 			
-			public static int[] ActionMode = new int[] {
+			public static int[] ActionMode = new int[]
+			{
 					2130772007,
 					2130772013,
 					2130772014,
@@ -4538,7 +4542,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int ActionMode_titleTextStyle = 1;
 			
-			public static int[] ActivityChooserView = new int[] {
+			public static int[] ActivityChooserView = new int[]
+			{
 					2130772035,
 					2130772036};
 			
@@ -4548,7 +4553,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0
 			public const int ActivityChooserView_initialActivityCount = 0;
 			
-			public static int[] AlertDialog = new int[] {
+			public static int[] AlertDialog = new int[]
+			{
 					16842994,
 					2130772037,
 					2130772038,
@@ -4574,7 +4580,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int AlertDialog_singleChoiceItemLayout = 4;
 			
-			public static int[] AppBarLayout = new int[] {
+			public static int[] AppBarLayout = new int[]
+			{
 					16842964,
 					2130772032,
 					2130772215};
@@ -4588,7 +4595,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int AppBarLayout_expanded = 2;
 			
-			public static int[] AppBarLayout_LayoutParams = new int[] {
+			public static int[] AppBarLayout_LayoutParams = new int[]
+			{
 					2130772216,
 					2130772217};
 			
@@ -4598,7 +4606,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1;
 			
-			public static int[] AppCompatImageView = new int[] {
+			public static int[] AppCompatImageView = new int[]
+			{
 					16843033,
 					2130772042};
 			
@@ -4608,7 +4617,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int AppCompatImageView_srcCompat = 1;
 			
-			public static int[] AppCompatTextView = new int[] {
+			public static int[] AppCompatTextView = new int[]
+			{
 					16842804,
 					2130772043};
 			
@@ -4618,7 +4628,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int AppCompatTextView_textAllCaps = 1;
 			
-			public static int[] AppCompatTheme = new int[] {
+			public static int[] AppCompatTheme = new int[]
+			{
 					16842839,
 					16842926,
 					2130772044,
@@ -5068,7 +5079,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 3
 			public const int AppCompatTheme_windowNoTitle = 3;
 			
-			public static int[] BottomSheetBehavior_Params = new int[] {
+			public static int[] BottomSheetBehavior_Params = new int[]
+			{
 					2130772218,
 					2130772219};
 			
@@ -5078,13 +5090,15 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0
 			public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
 			
-			public static int[] ButtonBarLayout = new int[] {
+			public static int[] ButtonBarLayout = new int[]
+			{
 					2130772154};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
 			
-			public static int[] CardView = new int[] {
+			public static int[] CardView = new int[]
+			{
 					16843071,
 					16843072,
 					2130771995,
@@ -5138,7 +5152,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 11
 			public const int CardView_contentPaddingTop = 11;
 			
-			public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
+			public static int[] CollapsingAppBarLayout_LayoutParams = new int[]
+			{
 					2130772220,
 					2130772221};
 			
@@ -5148,7 +5163,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
 			
-			public static int[] CollapsingToolbarLayout = new int[] {
+			public static int[] CollapsingToolbarLayout = new int[]
+			{
 					2130772009,
 					2130772222,
 					2130772223,
@@ -5206,7 +5222,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 10
 			public const int CollapsingToolbarLayout_toolbarId = 10;
 			
-			public static int[] CompoundButton = new int[] {
+			public static int[] CompoundButton = new int[]
+			{
 					16843015,
 					2130772155,
 					2130772156};
@@ -5220,7 +5237,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			public static int[] CoordinatorLayout = new int[] {
+			public static int[] CoordinatorLayout = new int[]
+			{
 					2130772235,
 					2130772236};
 			
@@ -5230,7 +5248,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int CoordinatorLayout_statusBarBackground = 1;
 			
-			public static int[] CoordinatorLayout_LayoutParams = new int[] {
+			public static int[] CoordinatorLayout_LayoutParams = new int[]
+			{
 					16842931,
 					2130772237,
 					2130772238,
@@ -5252,7 +5271,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 3
 			public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
 			
-			public static int[] DesignTheme = new int[] {
+			public static int[] DesignTheme = new int[]
+			{
 					2130772241,
 					2130772242,
 					2130772243};
@@ -5266,7 +5286,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			public static int[] DrawerArrowToggle = new int[] {
+			public static int[] DrawerArrowToggle = new int[]
+			{
 					2130772157,
 					2130772158,
 					2130772159,
@@ -5300,7 +5321,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			public static int[] FloatingActionButton = new int[] {
+			public static int[] FloatingActionButton = new int[]
+			{
 					2130772032,
 					2130772213,
 					2130772214,
@@ -5334,7 +5356,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			public static int[] ForegroundLinearLayout = new int[] {
+			public static int[] ForegroundLinearLayout = new int[]
+			{
 					16843017,
 					16843264,
 					2130772249};
@@ -5348,7 +5371,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			public static int[] LinearLayoutCompat = new int[] {
+			public static int[] LinearLayoutCompat = new int[]
+			{
 					16842927,
 					16842948,
 					16843046,
@@ -5386,7 +5410,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int LinearLayoutCompat_showDividers = 7;
 			
-			public static int[] LinearLayoutCompat_Layout = new int[] {
+			public static int[] LinearLayoutCompat_Layout = new int[]
+			{
 					16842931,
 					16842996,
 					16842997,
@@ -5404,7 +5429,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
 			
-			public static int[] ListPopupWindow = new int[] {
+			public static int[] ListPopupWindow = new int[]
+			{
 					16843436,
 					16843437};
 			
@@ -5414,7 +5440,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			public static int[] MediaRouteButton = new int[] {
+			public static int[] MediaRouteButton = new int[]
+			{
 					16843071,
 					16843072,
 					2130771994};
@@ -5428,7 +5455,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
 			
-			public static int[] MenuGroup = new int[] {
+			public static int[] MenuGroup = new int[]
+			{
 					16842766,
 					16842960,
 					16843156,
@@ -5454,7 +5482,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int MenuGroup_android_visible = 2;
 			
-			public static int[] MenuItem = new int[] {
+			public static int[] MenuItem = new int[]
+			{
 					16842754,
 					16842766,
 					16842960,
@@ -5524,7 +5553,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 13
 			public const int MenuItem_showAsAction = 13;
 			
-			public static int[] MenuView = new int[] {
+			public static int[] MenuView = new int[]
+			{
 					16842926,
 					16843052,
 					16843053,
@@ -5558,7 +5588,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int MenuView_preserveIconSpacing = 7;
 			
-			public static int[] NavigationView = new int[] {
+			public static int[] NavigationView = new int[]
+			{
 					16842964,
 					16842973,
 					16843039,
@@ -5600,7 +5631,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int NavigationView_menu = 4;
 			
-			public static int[] PopupWindow = new int[] {
+			public static int[] PopupWindow = new int[]
+			{
 					16843126,
 					2130772173};
 			
@@ -5610,13 +5642,15 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int PopupWindow_overlapAnchor = 1;
 			
-			public static int[] PopupWindowBackgroundState = new int[] {
+			public static int[] PopupWindowBackgroundState = new int[]
+			{
 					2130772174};
 			
 			// aapt resource value: 0
 			public const int PopupWindowBackgroundState_state_above_anchor = 0;
 			
-			public static int[] ProgressWheel = new int[] {
+			public static int[] ProgressWheel = new int[]
+			{
 					2130772284,
 					2130772285,
 					2130772286,
@@ -5666,7 +5700,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int ProgressWheel_ahTextSize = 2;
 			
-			public static int[] RecyclerView = new int[] {
+			public static int[] RecyclerView = new int[]
+			{
 					16842948,
 					2130771968,
 					2130771969,
@@ -5688,19 +5723,22 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int RecyclerView_stackFromEnd = 4;
 			
-			public static int[] ScrimInsetsFrameLayout = new int[] {
+			public static int[] ScrimInsetsFrameLayout = new int[]
+			{
 					2130772256};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
-			public static int[] ScrollingViewBehavior_Params = new int[] {
+			public static int[] ScrollingViewBehavior_Params = new int[]
+			{
 					2130772257};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
 			
-			public static int[] SearchView = new int[] {
+			public static int[] SearchView = new int[]
+			{
 					16842970,
 					16843039,
 					16843296,
@@ -5770,7 +5808,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 12
 			public const int SearchView_voiceIcon = 12;
 			
-			public static int[] SnackbarLayout = new int[] {
+			public static int[] SnackbarLayout = new int[]
+			{
 					16843039,
 					2130772032,
 					2130772258};
@@ -5784,7 +5823,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			public static int[] Spinner = new int[] {
+			public static int[] Spinner = new int[]
+			{
 					16842930,
 					16843126,
 					16843131,
@@ -5806,7 +5846,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			public static int[] SwitchCompat = new int[] {
+			public static int[] SwitchCompat = new int[]
+			{
 					16843044,
 					16843045,
 					16843074,
@@ -5848,7 +5889,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 3
 			public const int SwitchCompat_track = 3;
 			
-			public static int[] TabItem = new int[] {
+			public static int[] TabItem = new int[]
+			{
 					16842754,
 					16842994,
 					16843087};
@@ -5862,7 +5904,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			public static int[] TabLayout = new int[] {
+			public static int[] TabLayout = new int[]
+			{
 					2130772259,
 					2130772260,
 					2130772261,
@@ -5928,7 +5971,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 9
 			public const int TabLayout_tabTextColor = 9;
 			
-			public static int[] TextAppearance = new int[] {
+			public static int[] TextAppearance = new int[]
+			{
 					16842901,
 					16842902,
 					16842903,
@@ -5966,7 +6010,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 8
 			public const int TextAppearance_textAllCaps = 8;
 			
-			public static int[] TextInputLayout = new int[] {
+			public static int[] TextInputLayout = new int[]
+			{
 					16842906,
 					16843088,
 					2130772275,
@@ -6012,7 +6057,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int TextInputLayout_hintTextAppearance = 2;
 			
-			public static int[] Toolbar = new int[] {
+			public static int[] Toolbar = new int[]
+			{
 					16842927,
 					16843072,
 					2130772009,
@@ -6114,7 +6160,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 23
 			public const int Toolbar_titleTextColor = 23;
 			
-			public static int[] View = new int[] {
+			public static int[] View = new int[]
+			{
 					16842752,
 					16842970,
 					2130772210,
@@ -6136,7 +6183,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int View_theme = 4;
 			
-			public static int[] ViewBackgroundHelper = new int[] {
+			public static int[] ViewBackgroundHelper = new int[]
+			{
 					16842964,
 					2130772213,
 					2130772214};
@@ -6150,7 +6198,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
 			
-			public static int[] ViewStubCompat = new int[] {
+			public static int[] ViewStubCompat = new int[]
+			{
 					16842960,
 					16842994,
 					16842995};

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj

@@ -25,7 +25,8 @@
     <JavaOptions />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <AndroidTlsProvider></AndroidTlsProvider>
+    <AndroidTlsProvider>
+    </AndroidTlsProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -84,19 +85,11 @@
       <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
       <Private>True</Private>
@@ -104,8 +97,7 @@
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.2-beta1\lib\netstandard1.1\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="OkHttp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
@@ -177,22 +169,6 @@
       <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Pages.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.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Xamarin.Forms.Theme.Android">
       <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Android.dll</HintPath>
       <Private>True</Private>
@@ -205,9 +181,27 @@
       <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Light.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.3.175\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="FormsViewGroup">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform.Android">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Pages">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Pages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="Autofac">
+      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -380,8 +374,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.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'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\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.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.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')" />
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config

@@ -3,36 +3,62 @@
   <package id="Acr.Support" version="2.1.0" targetFramework="monoandroid70" />
   <package id="Acr.UserDialogs" version="6.3.3" targetFramework="monoandroid70" />
   <package id="AndHUD" version="1.2.0" targetFramework="monoandroid70" />
-  <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid70" />
+  <package id="Autofac" version="4.5.0" targetFramework="monoandroid60" />
   <package id="IdentityModel" version="1.3.1" targetFramework="monoandroid60" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
   <package id="Microsoft.CSharp" version="4.0.1" targetFramework="monoandroid70" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid70" />
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid60" />
+  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid60" />
   <package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid70" />
-  <package id="Newtonsoft.Json" version="9.0.2-beta1" targetFramework="monoandroid70" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid60" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
   <package id="SlideOverKit" version="2.1.4" targetFramework="monoandroid70" />
   <package id="Splat" version="1.6.2" targetFramework="monoandroid70" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="monoandroid60" />
   <package id="System.Collections" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="monoandroid60" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Console" version="4.0.0" targetFramework="monoandroid60" />
   <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="monoandroid60" />
   <package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Globalization" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="monoandroid60" />
   <package id="System.IO" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="monoandroid60" />
   <package id="System.Linq" version="4.1.0" targetFramework="monoandroid70" />
   <package id="System.Linq.Expressions" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="System.Net.Sockets" version="4.1.0" targetFramework="monoandroid60" />
   <package id="System.ObjectModel" version="4.0.12" targetFramework="monoandroid70" />
   <package id="System.Reflection" version="4.1.0" targetFramework="monoandroid70" />
   <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid70" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="monoandroid60" />
   <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid70" />
   <package id="System.Runtime" version="4.1.0" targetFramework="monoandroid70" />
   <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid70" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="monoandroid60" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="monoandroid60" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="monoandroid60" />
   <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="monoandroid70" />
   <package id="System.Runtime.Serialization.Primitives" version="4.1.1" targetFramework="monoandroid70" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="monoandroid60" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="monoandroid60" />
   <package id="System.Text.Encoding" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="monoandroid70" />
   <package id="System.Threading" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid60" />
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid70" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid70" />
@@ -46,8 +72,8 @@
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.FFImageLoading" version="2.2.6-pre-256" targetFramework="monoandroid70" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-256" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms.Pages" version="2.3.3.175" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
+  <package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="monoandroid60" />
   <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid70" />
   <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="monoandroid70" />
 </packages>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

@@ -20,7 +20,8 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <AndroidTlsProvider></AndroidTlsProvider>
+    <AndroidTlsProvider>
+    </AndroidTlsProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -47,12 +48,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
@@ -93,20 +89,16 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath>
@@ -175,10 +167,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\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.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" />
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.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">

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid70" />
@@ -9,7 +8,7 @@
   <package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
   <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="monoandroid70" />
   <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="monoandroid70" />

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
-    "Xamarin.Forms": "2.3.3.175",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
+    "Xamarin.Forms": "2.3.4.231",
     "xunit": "2.2.0-beta4-build3444",
     "xunit.runner.devices": "2.1.0",
     "xunit.runner.utility": "2.2.0-beta4-build3444"

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj

@@ -107,28 +107,20 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <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.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.iOS" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
@@ -178,8 +170,8 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\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.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
   <package id="xunit" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="xamarinios10" />
   <package id="xunit.assert" version="2.2.0-beta4-build3444" targetFramework="xamarinios10" />

src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json

@@ -2,13 +2,13 @@
   "dependencies": {
     "Acr.UserDialogs": "6.3.3",
     "IdentityModel": "1.3.1",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
     "Newtonsoft.Json": "9.0.1",
     "SlideOverKit": "2.1.4",
     "Xam.Plugins.Settings": "2.6.0.12-beta",
     "Xamarin.FFImageLoading": "2.2.6-pre-256",
     "Xamarin.FFImageLoading.Forms": "2.2.6-pre-256",
-    "Xamarin.Forms": "2.3.3.175",
+    "Xamarin.Forms": "2.3.4.231",
     "Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
     "Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"
   },

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj

@@ -162,10 +162,6 @@
       <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
       <Private>True</Private>
@@ -209,22 +205,6 @@
       <HintPath>..\..\..\..\packages\WebP.Touch.1.0.2\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Pages.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.3.175\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.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Xamarin.Forms.Theme.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll</HintPath>
       <Private>True</Private>
@@ -237,11 +217,27 @@
       <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Light.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.3.175\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Xamarin.iOS" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="Autofac">
+      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Core">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Platform.iOS">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Pages">
+      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\fake_product_01.png" />
@@ -432,8 +428,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <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'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\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.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.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')" />
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config

@@ -2,21 +2,67 @@
 <packages>
   <package id="Acr.Support" version="2.1.0" targetFramework="xamarinios10" />
   <package id="Acr.UserDialogs" version="6.3.3" targetFramework="xamarinios10" />
-  <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
+  <package id="Autofac" version="4.5.0" targetFramework="xamarinios10" />
   <package id="IdentityModel" version="1.3.1" targetFramework="xamarinios10" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="xamarinios10" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="xamarinios10" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="xamarinios10" />
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />
+  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="xamarinios10" />
   <package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
   <package id="SlideOverKit" version="2.1.4" targetFramework="xamarinios10" />
   <package id="Splat" version="1.6.2" targetFramework="xamarinios10" />
+  <package id="System.AppContext" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Collections" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="xamarinios10" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Console" version="4.0.0" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.IO" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Linq" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Net.Sockets" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="xamarinios10" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="xamarinios10" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="xamarinios10" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="xamarinios10" />
+  <package id="System.Threading" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="xamarinios10" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
   <package id="WebP.Touch" version="1.0.2" targetFramework="xamarinios10" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading" version="2.2.6-pre-256" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-256" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms" version="2.3.3.175" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Pages" version="2.3.3.175" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
+  <package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
 </packages>