From feddb62b02777d8bd5367a3089ac5d207dc1d236 Mon Sep 17 00:00:00 2001 From: David Britch Date: Thu, 4 May 2017 17:02:21 +0100 Subject: [PATCH] NuGet package consolidation. --- .../eShopOnContainers.Droid.csproj | 12 ++++-------- .../eShopOnContainers.Droid/packages.config | 4 ++-- .../eShopOnContainers.TestRunner.Droid.csproj | 18 +++++++++--------- .../packages.config | 4 ++-- .../project.json | 2 +- .../app.config | 0 .../eShopOnContainers.TestRunner.iOS.csproj | 18 +++++++++--------- .../packages.config | 4 ++-- .../eShopOnContainers.Windows/project.json | 4 ++-- .../eShopOnContainers.iOS/app.config | 0 .../eShopOnContainers.iOS.csproj | 17 ++++++----------- .../eShopOnContainers.iOS/packages.config | 6 +++--- 12 files changed, 40 insertions(+), 49 deletions(-) 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.iOS/app.config 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 mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/app.config mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj mode change 100644 => 100755 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index 558fd51b1..1f47b172a 100755 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -70,20 +70,16 @@ True - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Forms.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Platform.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config index 63ad8e969..22d2c2a91 100755 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config @@ -70,8 +70,8 @@ - - + + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj old mode 100644 new mode 100755 index e7c74378d..f1867bb67 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj @@ -53,6 +53,12 @@ + + ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll + + + ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll + @@ -90,6 +96,9 @@ ..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + ..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Pages.dll + ..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll @@ -152,12 +161,6 @@ ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Extensions.dll - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Primitives.dll - ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll @@ -179,9 +182,6 @@ ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll - - ..\..\..\..\packages\Xamarin.Forms.Pages.2.3.0.38-pre2\lib\MonoAndroid10\Xamarin.Forms.Pages.dll - ..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Android.dll diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config old mode 100644 new mode 100755 index 63ed24d5a..8262c106d --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config @@ -7,7 +7,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json index 73bde43da..8def8a57d 100755 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3", "Xamarin.Forms": "2.3.4.231", - "xunit": "2.2.0-beta4-build3444", + "xunit": "2.2.0", "xunit.runner.devices": "2.1.0", "xunit.runner.utility": "2.2.0-beta4-build3444" }, diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/app.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/app.config old mode 100644 new mode 100755 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj old mode 100644 new mode 100755 index b02ab9fc4..e0b9e0f24 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj @@ -110,11 +110,20 @@ + + ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll + + + ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll + ..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + ..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll + ..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll @@ -175,12 +184,6 @@ ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8\System.Net.Http.Extensions.dll - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8\System.Net.Http.Primitives.dll - ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll @@ -202,9 +205,6 @@ ..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll - - ..\..\..\..\packages\Xamarin.Forms.Pages.2.3.0.38-pre2\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll - ..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config old mode 100644 new mode 100755 index 897992f88..a593d9c75 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config @@ -6,7 +6,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json index 889f0a576..7c0df1e01 100755 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json @@ -6,8 +6,8 @@ "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.FFImageLoading": "2.2.9", + "Xamarin.FFImageLoading.Forms": "2.2.9", "Xamarin.Forms": "2.3.4.231", "Xamarin.Forms.Theme.Base": "1.0.0.43-pre1", "Xamarin.Forms.Theme.Light": "1.0.0.43-pre1" diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/app.config b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/app.config old mode 100644 new mode 100755 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj old mode 100644 new mode 100755 index ac0a28d6e..33fbb39d4 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj @@ -143,20 +143,16 @@ True - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\Xamarin.iOS10\FFImageLoading.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\Xamarin.iOS10\FFImageLoading.Forms.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\Xamarin.iOS10\FFImageLoading.Platform.dll - True + ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Platform.dll ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll @@ -201,9 +197,8 @@ - - ..\..\..\..\packages\WebP.Touch.1.0.2\lib\Xamarin.iOS10\WebP.Touch.dll - True + + ..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll ..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config old mode 100644 new mode 100755 index a37aa9bda..835c2555e --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config @@ -57,10 +57,10 @@ - + - - + +