From 24ca050458a744b5651e1a36c6d4269ecd060cba Mon Sep 17 00:00:00 2001 From: Dexter Valkyrie Date: Sat, 8 Jul 2017 09:53:43 +0100 Subject: [PATCH 01/33] Update Startup.cs The more general `builder.AddUserSecrets();` is deprecated and will not be available in ASP.NET Core 2.0. You must now qualify it with a type parameter. --- src/Services/Identity/Identity.API/Startup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs index bc8ca3cac..3726f98bc 100644 --- a/src/Services/Identity/Identity.API/Startup.cs +++ b/src/Services/Identity/Identity.API/Startup.cs @@ -40,7 +40,7 @@ namespace eShopOnContainers.Identity if (env.IsDevelopment()) { // For more details on using the user secret store see http://go.microsoft.com/fwlink/?LinkID=532709 - builder.AddUserSecrets(); + builder.AddUserSecrets(); } builder.AddEnvironmentVariables(); From 19663f7ba37509d710eb341a194aa95100032c88 Mon Sep 17 00:00:00 2001 From: David Britch Date: Thu, 10 Aug 2017 15:38:04 +0100 Subject: [PATCH 02/33] Removed Xamarin.Forms.Themes and Xamarin.Forms.DataPages NuGet packages in order to help speed up the app startup time #231 --- .../eShopOnContainers.Core/App.xaml | 130 ++++++++++++- .../Controls/AddBasketButton.xaml | 11 +- .../Effects/ThemeEffects.cs | 54 ++++++ .../eShopOnContainers.Core.csproj | 1 + .../eShopOnContainers.Core/project.json | 5 +- .../Activities/MainActivity.cs | 5 +- .../Effects/BaseContainerEffect.cs | 66 +++++++ .../Effects/CircleEffect.cs | 54 ++++++ .../Effects/EntryLineColorEffect.cs | 1 + .../Resources/Resource.Designer.cs | 181 +++++++++++------- .../eShopOnContainers.Droid.csproj | 17 +- .../eShopOnContainers.Droid/packages.config | 3 - .../Resources/Resource.Designer.cs | 179 ++++++++++------- .../eShopOnContainers.TestRunner.Droid.csproj | 12 -- .../packages.config | 3 - .../eShopOnContainers.TestRunner.iOS.csproj | 12 -- .../packages.config | 3 - .../eShopOnContainers.iOS/AppDelegate.cs | 14 +- .../Effects/CircleEffect.cs | 53 +++++ .../eShopOnContainers.iOS.csproj | 16 +- .../eShopOnContainers.iOS/packages.config | 3 - 21 files changed, 600 insertions(+), 223 deletions(-) create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/Effects/ThemeEffects.cs create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/BaseContainerEffect.cs create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml index b86ae54c8..79b0ff307 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml @@ -1,12 +1,11 @@ - + #ffffff @@ -18,6 +17,69 @@ #00857D #e2e2e2 #ff5252 + #757575 + #FFFFFF + #979797 + #007aff + #CCCCCC + #C9C9C9 + Transparent + Transparent + #007aff + #FFFFFF + #007aff + Transparent + #FFFFFF + #1FAECE + Transparent + Transparent + + + + + + + + + + + + + + + + + - + + + + + + @@ -108,7 +187,7 @@ - + + + + + + + + + + + + + + + + +