From 6a01f720600f69a31ba5cff3bf9b384b87208fe3 Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 3 May 2017 13:38:55 +0100 Subject: [PATCH 1/3] Removed CommonServiceLocator package from TestRunner projects. --- .../eShopOnContainers.TestRunner.Droid.csproj | 4 ---- .../eShopOnContainers.TestRunner.Droid/packages.config | 1 - .../eShopOnContainers.TestRunner.iOS.csproj | 4 ---- .../eShopOnContainers.TestRunner.iOS/packages.config | 1 - 4 files changed, 10 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj index be2e82d00..92ffb99bc 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj @@ -50,10 +50,6 @@ ..\..\..\..\packages\Xamarin.Forms.2.3.3.175\lib\MonoAndroid10\FormsViewGroup.dll True - - ..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True - diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config index e476aec36..63d0a686c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config @@ -1,6 +1,5 @@  - diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj index 0122264ae..ecdf1354c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj @@ -107,10 +107,6 @@ - - ..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True - diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config index ab2dec370..ec762a48d 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config @@ -1,6 +1,5 @@  - From a2e6c9ddc1c7da06d515e0d158627be87b4467be Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 3 May 2017 13:45:27 +0100 Subject: [PATCH 2/3] Removed CommonServiceLocator package from app. --- .../eShopOnContainers/eShopOnContainers.Core/project.json | 1 - .../eShopOnContainers.Droid/eShopOnContainers.Droid.csproj | 4 ---- .../eShopOnContainers/eShopOnContainers.Droid/packages.config | 1 - .../eShopOnContainers.iOS/eShopOnContainers.iOS.csproj | 4 ---- .../eShopOnContainers/eShopOnContainers.iOS/packages.config | 1 - 5 files changed, 11 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json index 20f36e083..8649044d5 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json @@ -2,7 +2,6 @@ "dependencies": { "Acr.UserDialogs": "6.3.3", "Autofac": "4.4.0", - "CommonServiceLocator": "1.3", "IdentityModel": "1.3.1", "Microsoft.Bcl": "1.1.10", "Microsoft.Bcl.Build": "1.0.21", diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index 0a02480c9..4f8d2e7c6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -93,10 +93,6 @@ True - - ..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll True diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config index 3d9f0c8a8..68486da07 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config @@ -3,7 +3,6 @@ - diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj index fa1114dd7..847f8de98 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj @@ -162,10 +162,6 @@ ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll True - - ..\..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - True - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll True diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config index de074af61..427c9a8cd 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config @@ -2,7 +2,6 @@ - From efb858f24e6ff0333fa80c498afcc862d0aa668e Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 3 May 2017 17:42:37 +0100 Subject: [PATCH 3/3] Bumped Forms version from 2.3.3 to 2.3.4. Consolidated Json.NET to 9.0.1. Updated Microsoft.NetCore.UniversalWindowsPlatform to 5.3.3. Added Autofac to iOS and Droid app projects. --- .../eShopOnContainers.Core/App.xaml | 2 + .../eShopOnContainers.Core.csproj | 8 +- .../eShopOnContainers.Core/project.json | 8 +- .../Resources/Resource.Designer.cs | 167 +- .../eShopOnContainers.Droid/app.config | 0 .../eShopOnContainers.Droid.csproj | 53 +- .../eShopOnContainers.Droid/packages.config | 33 +- .../Resources/Resource.Designer.cs | 5926 +---------------- .../app.config | 0 .../eShopOnContainers.TestRunner.Droid.csproj | 22 +- .../packages.config | 2 +- .../project.json | 4 +- .../eShopOnContainers.TestRunner.iOS.csproj | 16 +- .../packages.config | 2 +- .../eShopOnContainers.Windows/project.json | 4 +- .../eShopOnContainers.iOS.csproj | 43 +- .../eShopOnContainers.iOS/packages.config | 51 +- 17 files changed, 313 insertions(+), 6028 deletions(-) mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/app.config mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/app.config mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml index a04b35a17..150b01c90 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml @@ -134,6 +134,8 @@ Value="FillAndExpand" /> + + @@ -263,11 +263,11 @@ - 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}. + 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}. - + - +