From 470e62680297cd83cf2f0bdc422c11849aca71ff Mon Sep 17 00:00:00 2001 From: Sychev Igor Date: Thu, 4 Jan 2018 10:09:19 +0300 Subject: [PATCH 01/43] "Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta2" --- .../Microsoft.Extensions.HealthChecks.AzureStorage.csproj | 2 +- src/Services/Basket/Basket.API/Basket.API.csproj | 2 +- src/Services/Catalog/Catalog.API/Catalog.API.csproj | 2 +- src/Services/Identity/Identity.API/Identity.API.csproj | 2 +- src/Services/Location/Locations.API/Locations.API.csproj | 2 +- src/Services/Marketing/Marketing.API/Marketing.API.csproj | 2 +- src/Services/Ordering/Ordering.API/Ordering.API.csproj | 4 ++-- src/Services/Payment/Payment.API/Payment.API.csproj | 2 +- src/Web/WebMVC/WebMVC.csproj | 2 +- src/Web/WebSPA/WebSPA.csproj | 2 +- src/Web/WebStatus/WebStatus.csproj | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj index 2e0703387..eaa067a54 100644 --- a/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj +++ b/src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index ffefed367..0866e1161 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 15c1f3a48..749c00efd 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -37,7 +37,7 @@ - + diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index f6356d899..c3b7cc5d3 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Services/Location/Locations.API/Locations.API.csproj b/src/Services/Location/Locations.API/Locations.API.csproj index 3ae6ecf0f..9ea93b9e4 100644 --- a/src/Services/Location/Locations.API/Locations.API.csproj +++ b/src/Services/Location/Locations.API/Locations.API.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Services/Marketing/Marketing.API/Marketing.API.csproj b/src/Services/Marketing/Marketing.API/Marketing.API.csproj index 85cfcee1d..d566408ec 100644 --- a/src/Services/Marketing/Marketing.API/Marketing.API.csproj +++ b/src/Services/Marketing/Marketing.API/Marketing.API.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 00ab4e473..01c95761d 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -30,12 +30,12 @@ - + - + diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index 00238f467..009abfd27 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index ecb6a08f4..9857891d0 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 707c9b121..48c4f4635 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index ff7d28276..60a0a6c0a 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -7,7 +7,7 @@ - + From 56a60e3d2fe56c8d20b9a04c5872a2cc9806ce07 Mon Sep 17 00:00:00 2001 From: yanchenw Date: Fri, 5 Jan 2018 14:15:20 -0800 Subject: [PATCH 02/43] Try to fix windows container build error --- src/Web/WebMVC/Dockerfile | 2 -- src/Web/WebMVC/WebMVC.csproj | 4 ++-- src/Web/WebSPA/Dockerfile | 3 --- src/Web/WebSPA/WebSPA.csproj | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Web/WebMVC/Dockerfile b/src/Web/WebMVC/Dockerfile index b2e004f29..5fb657dd8 100644 --- a/src/Web/WebMVC/Dockerfile +++ b/src/Web/WebMVC/Dockerfile @@ -10,8 +10,6 @@ WORKDIR /src/src/Web/WebMVC RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN bower install --allow-root -RUN dotnet bundle RUN dotnet publish --no-restore -c Release -o /app FROM base AS final diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index ecb6a08f4..3752e8c26 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -27,10 +27,10 @@ - + diff --git a/src/Web/WebSPA/Dockerfile b/src/Web/WebSPA/Dockerfile index 879f21cc8..47032f41f 100644 --- a/src/Web/WebSPA/Dockerfile +++ b/src/Web/WebSPA/Dockerfile @@ -10,9 +10,6 @@ WORKDIR /src/src/Web/WebSPA RUN dotnet build --no-restore -c Release -o /app FROM build AS publish -RUN npm rebuild node-sass -RUN npm install -RUN npm run build:prod RUN dotnet publish --no-restore -c Release -o /app FROM base AS final diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 707c9b121..fae86b9a5 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -37,14 +37,14 @@ - + From 3186c634824b639260c1fe6485f51e3e7d2d0b54 Mon Sep 17 00:00:00 2001 From: yanchenw Date: Fri, 5 Jan 2018 14:33:04 -0800 Subject: [PATCH 03/43] Bug fix --- src/Web/WebMVC/WebMVC.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index 3752e8c26..b702bb3f8 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -28,7 +28,7 @@ - + From 447a23db5d720b0529cdd95aa7c497af45994b03 Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 10 Jan 2018 17:41:04 +0000 Subject: [PATCH 04/43] First batch of changes to move the Xamarin app to .NET Standard. --- eShopOnContainers-MobileApps.sln | 204 ++++++------- .../Properties/AssemblyInfo.cs | 30 -- .../Services/Identity/IdentityService.cs | 80 ----- .../eShopOnContainers.Core/app.config | 11 - .../eShopOnContainers.Core.csproj | 277 ------------------ .../eShopOnContainers.Core/project.json | 24 -- .../Activities/MainActivity.cs | 3 +- .../Helpers/Settings.cs | 60 ++-- .../Resources/Resource.Designer.cs | 1 - .../eShopOnContainers.Droid.csproj | 272 ++++++++--------- .../eShopOnContainers.Droid/packages.config | 93 ------ .../Helpers/Settings.cs | 44 +++ .../MainApplication.cs | 63 ---- .../Resources/Resource.Designer.cs | 1 - .../eShopOnContainers.TestRunner.Droid.csproj | 239 +++++++-------- .../packages.config | 97 ------ ...ShopOnContainers.TestRunner.Windows.csproj | 2 +- .../Helpers/Settings.cs | 44 +++ .../eShopOnContainers.TestRunner.iOS.csproj | 149 +++------- .../packages.config | 79 ----- .../Behaviors/EventToCommandBehaviorTests.cs | 120 -------- .../Helpers/PropertyChangeTracker.cs | 50 ++++ .../Mocks/MockViewModel.cs | 53 ---- .../Properties/AssemblyInfo.cs | 30 -- .../Services/BasketServiceTests.cs | 17 -- .../Services/CatalogServiceTests.cs | 36 --- .../Services/MarketingServiceTests.cs | 29 -- .../Services/OrdersServiceTests.cs | 28 -- .../ViewModels/CatalogViewModelTests.cs | 223 -------------- .../ViewModels/MainViewModelTests.cs | 54 ---- .../ViewModels/MarketingViewModelTests.cs | 62 ---- .../ViewModels/MockViewModelTests.cs | 113 ------- .../ViewModels/OrderViewModelTests.cs | 55 ---- .../eShopOnContainers.UnitTests/app.config | 11 - .../eShopOnContainers.UnitTests.csproj | 61 ---- .../eShopOnContainers.UnitTests/project.json | 10 - .../eShopOnContainers.iOS/Helpers/Settings.cs | 60 ++-- .../eShopOnContainers.iOS.csproj | 147 +++------- .../eShopOnContainers.iOS/packages.config | 72 ----- .../Animations/Base/AnimationBase.cs | 0 .../Animations/Base/EasingType.cs | 0 .../Animations/FadeToAnimation.cs | 0 .../Animations/StoryBoard.cs | 0 .../eShopOnContainers.Core/App.xaml | 16 +- .../eShopOnContainers.Core/App.xaml.cs | 10 +- .../Behaviors/Base/BindableBehavior.cs | 0 .../Behaviors/EventToCommandBehavior.cs | 0 .../Behaviors/LineColorBehavior.cs | 0 .../Controls/AddBasketButton.xaml | 0 .../Controls/AddBasketButton.xaml.cs | 0 .../Controls/CustomTabbedPage.cs | 0 .../Controls/ToggleButton.cs | 0 .../Converters/CountToBoolConverter.cs | 0 .../Converters/DatetimeConverter.cs | 0 .../Converters/DoubleConverter.cs | 0 .../FirstValidationErrorConverter.cs | 0 .../Converters/ImageConverter.cs | 0 .../Converters/InverseBoolConverter.cs | 0 .../Converters/InverseCountToBoolConverter.cs | 0 .../ItemTappedEventArgsConverter.cs | 0 .../Converters/ItemsToHeightConverter.cs | 0 .../StringNullOrEmptyBoolConverter.cs | 0 .../Converters/ToUpperConverter.cs | 0 .../WebNavigatedEventArgsConverter.cs | 0 .../WebNavigatingEventArgsConverter.cs | 0 .../Effects/EntryLineColorEffect.cs | 0 .../Effects/ThemeEffects.cs | 0 .../ServiceAuthenticationException.cs | 0 .../Extensions/ObservableExtension.cs | 0 .../eShopOnContainers.Core/GlobalSettings.cs | 0 .../Helpers/EasingHelper.cs | 0 .../Helpers/RandomNumberGenerator.cs | 0 .../Helpers/ServicesHelper.cs | 0 .../Helpers/Settings.cs | 34 +-- .../Models/Basket/BasketCheckout.cs | 0 .../Models/Basket/BasketItem.cs | 0 .../Models/Basket/CustomerBasket.cs | 0 .../Models/Catalog/CatalogBrand.cs | 0 .../Models/Catalog/CatalogItem.cs | 0 .../Models/Catalog/CatalogRoot.cs | 0 .../Models/Catalog/CatalogType.cs | 0 .../Models/Location/Location.cs | 0 .../Models/Marketing/Campaign.cs | 0 .../Models/Marketing/CampaignItem.cs | 0 .../Models/Marketing/CampaignRoot.cs | 0 .../Models/Navigation/TabParameter.cs | 0 .../Models/Orders/CancelOrderCommand.cs | 0 .../Models/Orders/CardType.CS | 0 .../Models/Orders/Order.cs | 0 .../Models/Orders/OrderItem.cs | 0 .../Models/Orders/OrderStatus.cs | 0 .../Models/Token/UserToken.cs | 0 .../Models/User/Address.cs | 0 .../Models/User/LogoutParameter.cs | 0 .../Models/User/PaymentInfo.cs | 0 .../Models/User/UserInfo.cs | 0 .../Services/Basket/BasketMockService.cs | 0 .../Services/Basket/BasketService.cs | 0 .../Services/Basket/IBasketService.cs | 0 .../Services/Catalog/CatalogMockService.cs | 0 .../Services/Catalog/CatalogService.cs | 0 .../Services/Catalog/ICatalogService.cs | 0 .../Services/Common/Common.cs | 0 .../Services/Dialog/DialogService.cs | 0 .../Services/Dialog/IDialogService.cs | 0 .../Services/Identity/IIdentityService.cs | 0 .../Services/Identity/IdentityService.cs | 81 +++++ .../Services/Location/ILocationService.cs | 0 .../Services/Location/LocationService.cs | 0 .../Services/Marketing/CampaignMockService.cs | 0 .../Services/Marketing/CampaignService.cs | 0 .../Services/Marketing/ICampaignService.cs | 0 .../Services/Navigation/INavigationService.cs | 0 .../Services/Navigation/NavigationService.cs | 0 .../Services/OpenUrl/IOpenUrlService.cs | 0 .../Services/OpenUrl/OpenUrlService.cs | 0 .../Services/Order/IOrderService.cs | 0 .../Services/Order/OrderMockService.cs | 0 .../Services/Order/OrderService.cs | 0 .../RequestProvider/HttpRequestExceptionEx.cs | 0 .../RequestProvider/IRequestProvider.cs | 0 .../RequestProvider/RequestProvider.cs | 0 .../Services/User/IUserService.cs | 0 .../Services/User/UserMockService.cs | 0 .../Services/User/UserService.cs | 0 .../Triggers/BeginAnimation.cs | 0 .../Validations/IValidationRule.cs | 0 .../Validations/IValidity.cs | 0 .../Validations/IsNotNullOrEmptyRule.cs | 0 .../Validations/ValidatableObject.cs | 0 .../ViewModels/Base/ExtendedBindableObject.cs | 0 .../ViewModels/Base/MessageKeys.cs | 0 .../ViewModels/Base/ViewModelBase.cs | 0 .../ViewModels/Base/ViewModelLocator.cs | 0 .../ViewModels/BasketViewModel.cs | 0 .../ViewModels/CampaignDetailsViewModel.cs | 0 .../ViewModels/CampaignViewModel.cs | 0 .../ViewModels/CatalogViewModel.cs | 0 .../ViewModels/CheckoutViewModel.cs | 0 .../ViewModels/LoginViewModel.cs | 0 .../ViewModels/MainViewModel.cs | 0 .../ViewModels/OrderDetailViewModel.cs | 0 .../ViewModels/ProfileViewModel.cs | 0 .../ViewModels/SettingsViewModel.cs | 0 .../Views/BasketView.xaml | 0 .../Views/BasketView.xaml.cs | 0 .../Views/CampaignDetailsView.xaml | 0 .../Views/CampaignDetailsView.xaml.cs | 0 .../Views/CampaignView.xaml | 0 .../Views/CampaignView.xaml.cs | 0 .../Views/CatalogView.xaml | 0 .../Views/CatalogView.xaml.cs | 0 .../Views/CheckoutView.xaml | 0 .../Views/CheckoutView.xaml.cs | 0 .../Views/CustomNavigationView.xaml | 0 .../Views/CustomNavigationView.xaml.cs | 0 .../Views/FiltersView.xaml | 0 .../Views/FiltersView.xaml.cs | 0 .../Views/LoginView.xaml | 0 .../Views/LoginView.xaml.cs | 0 .../Views/MainView.xaml | 0 .../Views/MainView.xaml.cs | 0 .../Views/OrderDetailView.xaml | 0 .../Views/OrderDetailView.xaml.cs | 0 .../Views/ProfileView.xaml | 0 .../Views/ProfileView.xaml.cs | 0 .../Views/SettingsView.xaml | 0 .../Views/SettingsView.xaml.cs | 0 .../Views/Templates/BasketItemTemplate.xaml | 0 .../Templates/BasketItemTemplate.xaml.cs | 0 .../Views/Templates/CampaignTemplate.xaml | 0 .../Views/Templates/CampaignTemplate.xaml.cs | 0 .../Views/Templates/OrderItemTemplate.xaml | 0 .../Views/Templates/OrderItemTemplate.xaml.cs | 0 .../Views/Templates/OrderTemplate.xaml | 0 .../Views/Templates/OrderTemplate.xaml.cs | 0 .../Views/Templates/ProductTemplate.xaml | 0 .../Views/Templates/ProductTemplate.xaml.cs | 0 .../eShopOnContainers.Core.csproj | 26 ++ 179 files changed, 762 insertions(+), 2409 deletions(-) mode change 100755 => 100644 eShopOnContainers-MobileApps.sln delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/Properties/AssemblyInfo.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/app.config delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Helpers/Settings.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config mode change 100755 => 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/Helpers/Settings.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs create mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Helpers/PropertyChangeTracker.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Properties/AssemblyInfo.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/BasketServiceTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/CatalogServiceTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/OrdersServiceTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/app.config delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/project.json delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Animations/Base/AnimationBase.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Animations/Base/EasingType.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Animations/FadeToAnimation.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Animations/StoryBoard.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/App.xaml (97%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/App.xaml.cs (94%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Behaviors/Base/BindableBehavior.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Behaviors/EventToCommandBehavior.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Controls/AddBasketButton.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Controls/AddBasketButton.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Controls/CustomTabbedPage.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Controls/ToggleButton.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/CountToBoolConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/DatetimeConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/DoubleConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/FirstValidationErrorConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/ImageConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/InverseBoolConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/InverseCountToBoolConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/ItemTappedEventArgsConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/ItemsToHeightConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/StringNullOrEmptyBoolConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/ToUpperConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/WebNavigatedEventArgsConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Converters/WebNavigatingEventArgsConverter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Effects/EntryLineColorEffect.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Effects/ThemeEffects.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Exceptions/ServiceAuthenticationException.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Extensions/ObservableExtension.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/GlobalSettings.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Helpers/EasingHelper.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Helpers/RandomNumberGenerator.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Helpers/ServicesHelper.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Helpers/Settings.cs (59%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Basket/BasketCheckout.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Basket/BasketItem.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Basket/CustomerBasket.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Catalog/CatalogBrand.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Catalog/CatalogItem.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Catalog/CatalogRoot.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Catalog/CatalogType.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Location/Location.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Marketing/Campaign.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Marketing/CampaignItem.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Marketing/CampaignRoot.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Navigation/TabParameter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Orders/CancelOrderCommand.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Orders/CardType.CS (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Orders/Order.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Orders/OrderItem.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Orders/OrderStatus.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/Token/UserToken.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/User/Address.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/User/LogoutParameter.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/User/PaymentInfo.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Models/User/UserInfo.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Basket/BasketMockService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Basket/BasketService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Basket/IBasketService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Catalog/CatalogMockService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Catalog/CatalogService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Catalog/ICatalogService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Common/Common.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Dialog/DialogService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Dialog/IDialogService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Identity/IIdentityService.cs (100%) create mode 100644 src/eShopOnContainers.Core/Services/Identity/IdentityService.cs rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Location/ILocationService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Location/LocationService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Marketing/CampaignService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Navigation/INavigationService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Navigation/NavigationService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/OpenUrl/IOpenUrlService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/OpenUrl/OpenUrlService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Order/IOrderService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Order/OrderMockService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/Order/OrderService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/RequestProvider/HttpRequestExceptionEx.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/User/IUserService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/User/UserMockService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Services/User/UserService.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Triggers/BeginAnimation.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Validations/IValidationRule.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Validations/IValidity.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Validations/IsNotNullOrEmptyRule.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Validations/ValidatableObject.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/Base/ExtendedBindableObject.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/Base/MessageKeys.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/BasketViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/LoginViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/MainViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/BasketView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/BasketView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CampaignDetailsView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CampaignDetailsView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CampaignView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CampaignView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CatalogView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CatalogView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CheckoutView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CheckoutView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CustomNavigationView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/CustomNavigationView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/FiltersView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/FiltersView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/LoginView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/LoginView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/MainView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/MainView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/OrderDetailView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/OrderDetailView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/ProfileView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/ProfileView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/SettingsView.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/SettingsView.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/CampaignTemplate.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/CampaignTemplate.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/OrderItemTemplate.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/OrderTemplate.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/OrderTemplate.xaml.cs (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/ProductTemplate.xaml (100%) rename src/{Mobile/eShopOnContainers => }/eShopOnContainers.Core/Views/Templates/ProductTemplate.xaml.cs (100%) create mode 100644 src/eShopOnContainers.Core/eShopOnContainers.Core.csproj diff --git a/eShopOnContainers-MobileApps.sln b/eShopOnContainers-MobileApps.sln old mode 100755 new mode 100644 index 74c882912..590e0a54e --- a/eShopOnContainers-MobileApps.sln +++ b/eShopOnContainers-MobileApps.sln @@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "src\Mobile\eShopOnContainers\eShopOnContainers.Core\eShopOnContainers.Core.csproj", "{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Droid", "src\Mobile\eShopOnContainers\eShopOnContainers.Droid\eShopOnContainers.Droid.csproj", "{62DBB163-9CA9-4818-B48B-13233DF37C24}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.iOS", "src\Mobile\eShopOnContainers\eShopOnContainers.iOS\eShopOnContainers.iOS.csproj", "{6EEB23DC-7063-4444-9AF8-90DF24F549C0}" @@ -30,14 +28,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{9CC7 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{B7B1D395-4E06-4036-BE86-C216756B9367}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UnitTests", "src\Mobile\eShopOnContainers\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj", "{6E4285E7-7611-4440-A1B5-3513EBB13807}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.Droid", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Droid\eShopOnContainers.TestRunner.Droid.csproj", "{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.iOS", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.iOS\eShopOnContainers.TestRunner.iOS.csproj", "{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.Windows", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Windows\eShopOnContainers.TestRunner.Windows.csproj", "{A7337243-33B8-463A-87AD-944B75EFD820}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "src\eShopOnContainers.Core\eShopOnContainers.Core.csproj", "{42527749-70D5-4A44-85B4-33C4E34C7C53}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UnitTests", "src\Mobile\eShopOnContainers\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj", "{FDD910BC-DF0F-483D-B7D5-C7D831855172}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -66,54 +66,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|Any CPU.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|ARM.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|ARM.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhone.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x64.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x64.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x86.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x86.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|ARM.Build.0 = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhone.Build.0 = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x64.ActiveCfg = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x64.Build.0 = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x86.ActiveCfg = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x86.Build.0 = Debug|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|Any CPU.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|ARM.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|ARM.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhone.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhone.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x64.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x64.Build.0 = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x86.ActiveCfg = Release|Any CPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x86.Build.0 = Release|Any CPU {62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU @@ -283,54 +235,6 @@ Global {C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.ActiveCfg = Release|x86 {C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.Build.0 = Release|x86 {C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.Deploy.0 = Release|x86 - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|ARM.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x64.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x86.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|Any CPU.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|Any CPU.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|ARM.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|ARM.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhone.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhone.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x64.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x64.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x86.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x86.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|ARM.Build.0 = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhone.Build.0 = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x64.ActiveCfg = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x64.Build.0 = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x86.ActiveCfg = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x86.Build.0 = Debug|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|Any CPU.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|ARM.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|ARM.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhone.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhone.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x64.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x64.Build.0 = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x86.ActiveCfg = Release|Any CPU - {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x86.Build.0 = Release|Any CPU {A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU @@ -500,23 +404,119 @@ Global {A7337243-33B8-463A-87AD-944B75EFD820}.Release|x86.ActiveCfg = Release|x86 {A7337243-33B8-463A-87AD-944B75EFD820}.Release|x86.Build.0 = Release|x86 {A7337243-33B8-463A-87AD-944B75EFD820}.Release|x86.Deploy.0 = Release|x86 + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|ARM.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|x64.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Ad-Hoc|x86.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|Any CPU.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|ARM.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|ARM.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|iPhone.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|x64.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|x64.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|x86.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.AppStore|x86.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|ARM.ActiveCfg = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|ARM.Build.0 = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|iPhone.Build.0 = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|x64.ActiveCfg = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|x64.Build.0 = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|x86.ActiveCfg = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Debug|x86.Build.0 = Debug|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|Any CPU.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|ARM.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|ARM.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|iPhone.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|iPhone.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|x64.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|x64.Build.0 = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|x86.ActiveCfg = Release|Any CPU + {42527749-70D5-4A44-85B4-33C4E34C7C53}.Release|x86.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|ARM.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|x64.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Ad-Hoc|x86.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|Any CPU.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|ARM.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|ARM.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|iPhone.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|x64.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|x64.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|x86.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.AppStore|x86.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|ARM.ActiveCfg = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|ARM.Build.0 = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|iPhone.Build.0 = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|x64.ActiveCfg = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|x64.Build.0 = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|x86.ActiveCfg = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Debug|x86.Build.0 = Debug|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|Any CPU.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|ARM.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|ARM.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|iPhone.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|iPhone.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|x64.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|x64.Build.0 = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|x86.ActiveCfg = Release|Any CPU + {FDD910BC-DF0F-483D-B7D5-C7D831855172}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {F61357CE-1CC2-410E-8776-B16EEBC98EB8} = {932D8224-11F6-4D07-B109-DA28AD288A63} - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} = {778289CA-31F7-4464-8C2A-612EE846F8A7} {62DBB163-9CA9-4818-B48B-13233DF37C24} = {9CC7814B-72A6-465B-A61C-57B512DEE303} {6EEB23DC-7063-4444-9AF8-90DF24F549C0} = {9CC7814B-72A6-465B-A61C-57B512DEE303} {C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B} = {9CC7814B-72A6-465B-A61C-57B512DEE303} {778289CA-31F7-4464-8C2A-612EE846F8A7} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8} {9CC7814B-72A6-465B-A61C-57B512DEE303} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8} {B7B1D395-4E06-4036-BE86-C216756B9367} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E} - {6E4285E7-7611-4440-A1B5-3513EBB13807} = {B7B1D395-4E06-4036-BE86-C216756B9367} {A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1} = {B7B1D395-4E06-4036-BE86-C216756B9367} {B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {B7B1D395-4E06-4036-BE86-C216756B9367} {A7337243-33B8-463A-87AD-944B75EFD820} = {B7B1D395-4E06-4036-BE86-C216756B9367} + {42527749-70D5-4A44-85B4-33C4E34C7C53} = {778289CA-31F7-4464-8C2A-612EE846F8A7} + {FDD910BC-DF0F-483D-B7D5-C7D831855172} = {B7B1D395-4E06-4036-BE86-C216756B9367} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8A9E878A-C296-4615-97AB-7A4505148872} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Properties/AssemblyInfo.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Properties/AssemblyInfo.cs deleted file mode 100644 index d93e1f7a2..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("eShopOnContainers.Core")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("eShopOnContainers.Core")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs deleted file mode 100644 index 6b3ef722a..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using eShopOnContainers.Core.Services.RequestProvider; -using eShopOnContainers.Core.Models.Token; -using eShopOnContainers.Core.Helpers; -using IdentityModel; -using IdentityModel.Client; -using PCLCrypto; -using static PCLCrypto.WinRTCrypto; - -namespace eShopOnContainers.Core.Services.Identity -{ - public class IdentityService : IIdentityService - { - private readonly IRequestProvider _requestProvider; - private string _codeVerifier; - - public IdentityService(IRequestProvider requestProvider) - { - _requestProvider = requestProvider; - } - - public string CreateAuthorizationRequest() - { - // Create URI to authorization endpoint - var authorizeRequest = new AuthorizeRequest(GlobalSetting.Instance.IdentityEndpoint); - - // Dictionary with values for the authorize request - var dic = new Dictionary(); - dic.Add("client_id", GlobalSetting.Instance.ClientId); - dic.Add("client_secret", GlobalSetting.Instance.ClientSecret); - dic.Add("response_type", "code id_token"); - dic.Add("scope", "openid profile basket orders locations marketing offline_access"); - dic.Add("redirect_uri", GlobalSetting.Instance.IdentityCallback); - dic.Add("nonce", Guid.NewGuid().ToString("N")); - dic.Add("code_challenge", CreateCodeChallenge()); - dic.Add("code_challenge_method", "S256"); - - // Add CSRF token to protect against cross-site request forgery attacks. - var currentCSRFToken = Guid.NewGuid().ToString("N"); - dic.Add("state", currentCSRFToken); - - var authorizeUri = authorizeRequest.Create(dic); - return authorizeUri; - } - - public string CreateLogoutRequest(string token) - { - if (string.IsNullOrEmpty(token)) - { - return string.Empty; - } - - return string.Format("{0}?id_token_hint={1}&post_logout_redirect_uri={2}", - GlobalSetting.Instance.LogoutEndpoint, - token, - GlobalSetting.Instance.LogoutCallback); - } - - public async Task GetTokenAsync(string code) - { - string data = string.Format("grant_type=authorization_code&code={0}&redirect_uri={1}&code_verifier={2}", code, WebUtility.UrlEncode(GlobalSetting.Instance.IdentityCallback), _codeVerifier); - var token = await _requestProvider.PostAsync(GlobalSetting.Instance.TokenEndpoint, data, GlobalSetting.Instance.ClientId, GlobalSetting.Instance.ClientSecret); - return token; - } - - private string CreateCodeChallenge() - { - _codeVerifier = RandomNumberGenerator.CreateUniqueId(); - var sha256 = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithm.Sha256); - var challengeBuffer = sha256.HashData(CryptographicBuffer.CreateFromByteArray(Encoding.UTF8.GetBytes(_codeVerifier))); - byte[] challengeBytes; - CryptographicBuffer.CopyToByteArray(challengeBuffer, out challengeBytes); - return Base64Url.Encode(challengeBytes); - } - } -} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/app.config b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/app.config deleted file mode 100644 index 8460dd432..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj deleted file mode 100644 index db84bee81..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj +++ /dev/null @@ -1,277 +0,0 @@ - - - - Debug - AnyCPU - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - Library - eShopOnContainers.Core - eShopOnContainers.Core - v4.5 - Profile111 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - - - true - bin\Release - prompt - 4 - - - - - App.xaml - - - - - - - AddBasketButton.xaml - - - - - - - - - - - - - - - - - - - - - - - - - BasketItemTemplate.xaml - - - CampaignTemplate.xaml - - - OrderItemTemplate.xaml - - - OrderTemplate.xaml - - - ProductTemplate.xaml - - - BasketView.xaml - - - CampaignDetailsView.xaml - - - CampaignView.xaml - - - CatalogView.xaml - - - CheckoutView.xaml - - - CustomNavigationView.xaml - - - FiltersView.xaml - - - LoginView.xaml - - - MainView.xaml - - - OrderDetailView.xaml - - - ProfileView.xaml - - - SettingsView.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - Designer - MSBuild:UpdateDesignTimeXaml - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json deleted file mode 100644 index 17f816122..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "dependencies": { - "Acr.UserDialogs": "6.3.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.1", - "PCLCrypto": "2.0.147", - "SlideOverKit": "2.1.4", - "Splat": "1.6.2", - "System.ComponentModel.Annotations": "4.3.0", - "Xam.Plugin.Geolocator": "3.0.4", - "Xam.Plugins.Settings": "2.6.0.12-beta", - "Xamarin.FFImageLoading": "2.2.9", - "Xamarin.FFImageLoading.Forms": "2.2.9", - "Xamarin.Forms": "2.5.0.91635" - }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile111": {} - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs index 95c822a18..d1dacc488 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs @@ -34,7 +34,7 @@ namespace eShopOnContainers.Droid.Activities global::Xamarin.Forms.Forms.Init(this, bundle); UserDialogs.Init(this); - CachedImageRenderer.Init(); + CachedImageRenderer.Init(false); LoadApplication(new App()); Window window = this.Window; @@ -56,6 +56,7 @@ namespace eShopOnContainers.Droid.Activities public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults) { + base.OnRequestPermissionsResult(requestCode, permissions, grantResults); PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults); } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs index 26dd9496b..bde99859e 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs @@ -5,40 +5,40 @@ using Plugin.Settings.Abstractions; namespace eShopOnContainers.Droid.Helpers { - /// - /// This is the Settings static class that can be used in your Core solution or in any - /// of your client applications. All settings are laid out the same exact way with getters - /// and setters. - /// - public static class Settings - { - private static ISettings AppSettings - { - get - { - return CrossSettings.Current; - } - } + /// + /// This is the Settings static class that can be used in your Core solution or in any + /// of your client applications. All settings are laid out the same exact way with getters + /// and setters. + /// + public static class Settings + { + private static ISettings AppSettings + { + get + { + return CrossSettings.Current; + } + } - #region Setting Constants + #region Setting Constants - private const string SettingsKey = "settings_key"; - private static readonly string SettingsDefault = string.Empty; + private const string SettingsKey = "settings_key"; + private static readonly string SettingsDefault = string.Empty; - #endregion + #endregion - public static string GeneralSettings - { - get - { - return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault); - } - set - { - AppSettings.AddOrUpdateValue(SettingsKey, value); - } - } + public static string GeneralSettings + { + get + { + return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault); + } + set + { + AppSettings.AddOrUpdateValue(SettingsKey, value); + } + } - } + } }*/ \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs index b38c77f50..074729b61 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs @@ -63,7 +63,6 @@ namespace eShopOnContainers.Droid global::AndroidHUD.Resource.Styleable.ProgressWheel_ahText = global::eShopOnContainers.Droid.Resource.Styleable.ProgressWheel_ahText; global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextColor = global::eShopOnContainers.Droid.Resource.Styleable.ProgressWheel_ahTextColor; global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextSize = global::eShopOnContainers.Droid.Resource.Styleable.ProgressWheel_ahTextSize; - global::ModernHttpClient.Resource.String.library_name = global::eShopOnContainers.Droid.Resource.String.library_name; global::PCLCrypto.Resource.String.ApplicationName = global::eShopOnContainers.Droid.Resource.String.ApplicationName; global::PCLCrypto.Resource.String.Hello = global::eShopOnContainers.Droid.Resource.String.Hello; global::Splat.Resource.String.library_name = global::eShopOnContainers.Droid.Resource.String.library_name; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj index 8a2babd2e..00e065862 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj @@ -1,6 +1,7 @@  - + + Debug AnyCPU @@ -56,189 +57,173 @@ SdkOnly - - ..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll - True - - - ..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll - True + + + + + + + + + + + ..\..\..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll + + ..\..\..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll + + ..\..\..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll - - ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll - True + + ..\..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll - True + + ..\..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll - - - - ..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll + + ..\..\..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll - True + + ..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll - - ..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll + + ..\..\..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll - - ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + + ..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll - - ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + + ..\..\..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll - - ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + + ..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll - - ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + + ..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll - - ..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll + + ..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll + + ..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll + + ..\..\..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - - ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll + + ..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - - ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\FormsViewGroup.dll - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll - True + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll - True + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll - True + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll - True + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - ..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll - True + + ..\..\..\..\packages\Xamarin.Android.Support.Exif.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Exif.dll - - - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll - True + + ..\..\..\..\packages\Xamarin.FFImageLoading.2.3.4\lib\MonoAndroid10\FFImageLoading.dll - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll - True + + ..\..\..\..\packages\Xamarin.FFImageLoading.2.3.4\lib\MonoAndroid10\FFImageLoading.Platform.dll - - - - ..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.3.4\lib\MonoAndroid10\FFImageLoading.Forms.dll - - - ..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll + + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.3.4\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll - - ..\..\..\..\packages\Acr.UserDialogs.6.3.8\lib\MonoAndroid10\Acr.UserDialogs.dll + + ..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll - - ..\..\..\..\packages\Acr.UserDialogs.6.3.8\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll + + ..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\FormsViewGroup.dll + + ..\..\..\..\packages\Splat.2.0.0\lib\MonoAndroid403\Splat.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + ..\..\..\..\packages\Acr.UserDialogs.6.5.1\lib\MonoAndroid10\Acr.UserDialogs.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + ..\..\..\..\packages\Acr.UserDialogs.6.5.1\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + ..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + + ..\..\..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll - - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll + + ..\..\..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.dll - - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll + + ..\..\..\..\packages\SlideOverKit.2.1.5\lib\MonoAndroid10\SlideOverKit.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + + ..\..\..\..\packages\SlideOverKit.2.1.5\lib\MonoAndroid10\SlideOverKit.Droid.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + + ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll - - ..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll + + ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll + + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll + + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.dll - - ..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.CardView.dll + + ..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Extensions.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Media.Compat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll + + ..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Primitives.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll + + ..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Core.Utils.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll + + ..\..\..\..\packages\IdentityModel.3.0.0\lib\netstandard2.0\IdentityModel.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Fragment.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll + + ..\..\..\..\packages\Autofac.4.6.2\lib\netstandard1.1\Autofac.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll + + ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll - - ..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Transition.dll + + ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll - - ..\..\..\..\packages\Xamarin.Android.Support.v4.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll + + ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll - - ..\..\..\..\packages\Xamarin.Android.Support.v7.Palette.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll + + ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll - - ..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + + ..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll - - ..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + + ..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll - @@ -249,6 +234,7 @@ + @@ -261,7 +247,6 @@ Assets\SourceSansPro-Regular.ttf - @@ -281,6 +266,7 @@ + @@ -397,33 +383,29 @@ - - {ba96a12c-4ee3-46c4-bb3f-f811b554cd01} + + {42527749-70D5-4A44-85B4-33C4E34C7C53} eShopOnContainers.Core - - - 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}. - - - - - - - - - - + - + + + + + + + + + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config deleted file mode 100644 index 08c447821..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Helpers/Settings.cs new file mode 100644 index 000000000..cb5487236 --- /dev/null +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Helpers/Settings.cs @@ -0,0 +1,44 @@ +/* +// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it. +using Plugin.Settings; +using Plugin.Settings.Abstractions; + +namespace eShopOnContainers.TestRunner.Droid.Helpers +{ + /// + /// This is the Settings static class that can be used in your Core solution or in any + /// of your client applications. All settings are laid out the same exact way with getters + /// and setters. + /// + public static class Settings + { + private static ISettings AppSettings + { + get + { + return CrossSettings.Current; + } + } + + #region Setting Constants + + private const string SettingsKey = "settings_key"; + private static readonly string SettingsDefault = string.Empty; + + #endregion + + + public static string GeneralSettings + { + get + { + return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault); + } + set + { + AppSettings.AddOrUpdateValue(SettingsKey, value); + } + } + + } +}*/ \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs deleted file mode 100644 index 770fedc82..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System; - -using Android.App; -using Android.OS; -using Android.Runtime; -using Plugin.CurrentActivity; - -namespace eShopOnContainers.TestRunner.Droid -{ - //You can specify additional application information in this attribute - [Application] - public class MainApplication : Application, Application.IActivityLifecycleCallbacks - { - public MainApplication(IntPtr handle, JniHandleOwnership transer) - :base(handle, transer) - { - } - - public override void OnCreate() - { - base.OnCreate(); - RegisterActivityLifecycleCallbacks(this); - //A great place to initialize Xamarin.Insights and Dependency Services! - } - - public override void OnTerminate() - { - base.OnTerminate(); - UnregisterActivityLifecycleCallbacks(this); - } - - public void OnActivityCreated(Activity activity, Bundle savedInstanceState) - { - CrossCurrentActivity.Current.Activity = activity; - } - - public void OnActivityDestroyed(Activity activity) - { - } - - public void OnActivityPaused(Activity activity) - { - } - - public void OnActivityResumed(Activity activity) - { - CrossCurrentActivity.Current.Activity = activity; - } - - public void OnActivitySaveInstanceState(Activity activity, Bundle outState) - { - } - - public void OnActivityStarted(Activity activity) - { - CrossCurrentActivity.Current.Activity = activity; - } - - public void OnActivityStopped(Activity activity) - { - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs index 10b2f2ea4..cf88d1538 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs @@ -63,7 +63,6 @@ namespace eShopOnContainers.TestRunner.Droid global::AndroidHUD.Resource.Styleable.ProgressWheel_ahText = global::eShopOnContainers.TestRunner.Droid.Resource.Styleable.ProgressWheel_ahText; global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextColor = global::eShopOnContainers.TestRunner.Droid.Resource.Styleable.ProgressWheel_ahTextColor; global::AndroidHUD.Resource.Styleable.ProgressWheel_ahTextSize = global::eShopOnContainers.TestRunner.Droid.Resource.Styleable.ProgressWheel_ahTextSize; - global::ModernHttpClient.Resource.String.library_name = global::eShopOnContainers.TestRunner.Droid.Resource.String.library_name; global::PCLCrypto.Resource.String.ApplicationName = global::eShopOnContainers.TestRunner.Droid.Resource.String.ApplicationName; global::PCLCrypto.Resource.String.Hello = global::eShopOnContainers.TestRunner.Droid.Resource.String.Hello; global::Splat.Resource.String.library_name = global::eShopOnContainers.TestRunner.Droid.Resource.String.library_name; 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 9fc51542f..6a222d875 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj @@ -1,6 +1,8 @@  - + + + Debug AnyCPU @@ -49,108 +51,12 @@ - - ..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll - - - ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll - - - ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll - - - ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll - - - ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll - - - ..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll - - - ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll - - - ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll - - - ..\..\..\..\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 - - - ..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll - - - ..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll - - - ..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll - - - ..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\monoandroid\xunit.execution.dotnet.dll - - - ..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll - - - ..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - - - ..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll - - - ..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll - - - ..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll - - - ..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll - - - ..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll - - - ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll - ..\..\..\..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll @@ -196,53 +102,146 @@ ..\..\..\..\packages\Xamarin.Android.Support.Design.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Design.dll - - ..\..\..\..\packages\Acr.UserDialogs.6.3.8\lib\MonoAndroid10\Acr.UserDialogs.dll - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.8\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll - ..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\FormsViewGroup.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\FormsViewGroup.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - ..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\MonoAndroid\xunit.runner.devices.dll + ..\..\..\..\packages\xunit.runner.devices.2.3.3\lib\monoandroid80\xunit.runner.devices.dll + + + ..\..\..\..\packages\xunit.runner.devices.2.3.3\lib\monoandroid80\xunit.runner.utility.netstandard15.dll + + + + + + + + + ..\..\..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll + + + ..\..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll + + + ..\..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll + + + ..\..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\netstandard1.1\xunit.execution.dotnet.dll + + + ..\..\..\..\packages\SlideOverKit.2.1.5\lib\MonoAndroid10\SlideOverKit.dll + + + ..\..\..\..\packages\SlideOverKit.2.1.5\lib\MonoAndroid10\SlideOverKit.Droid.dll + + + + ..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll + + + ..\..\..\..\packages\IdentityModel.3.0.0\lib\netstandard2.0\IdentityModel.dll + + + ..\..\..\..\packages\Autofac.4.6.2\lib\netstandard1.1\Autofac.dll + + + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll + + + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.dll + + + ..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll + + + ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll + + + ..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll + + + ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll + + + ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll + + + ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll + + + ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll + + + ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll + + + ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll + + + ..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll + + + ..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll + + + ..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll + + + ..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll + + + ..\..\..\..\packages\Splat.2.0.0\lib\MonoAndroid403\Splat.dll + + + ..\..\..\..\packages\Acr.UserDialogs.6.5.1\lib\MonoAndroid10\Acr.UserDialogs.dll + + + ..\..\..\..\packages\Acr.UserDialogs.6.5.1\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll + + + ..\..\..\..\packages\Xamarin.Android.Support.Exif.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Exif.dll + + + ..\..\..\..\packages\Xamarin.FFImageLoading.2.3.4\lib\MonoAndroid10\FFImageLoading.dll + + + ..\..\..\..\packages\Xamarin.FFImageLoading.2.3.4\lib\MonoAndroid10\FFImageLoading.Platform.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.3.4\lib\MonoAndroid10\FFImageLoading.Forms.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.3.4\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll - + + - - Designer - + @@ -260,12 +259,11 @@ - {6E4285E7-7611-4440-A1B5-3513EBB13807} + {FDD910BC-DF0F-483D-B7D5-C7D831855172} eShopOnContainers.UnitTests - @@ -281,6 +279,9 @@ - - + + + + + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config deleted file mode 100644 index edb63a00d..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj old mode 100755 new mode 100644 index e9507f015..a14b88f80 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj @@ -1,5 +1,5 @@  - + Debug diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/Helpers/Settings.cs new file mode 100644 index 000000000..c33056594 --- /dev/null +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/Helpers/Settings.cs @@ -0,0 +1,44 @@ +/* +// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it. +using Plugin.Settings; +using Plugin.Settings.Abstractions; + +namespace eShopOnContainers.TestRunner.iOS.Helpers +{ + /// + /// This is the Settings static class that can be used in your Core solution or in any + /// of your client applications. All settings are laid out the same exact way with getters + /// and setters. + /// + public static class Settings + { + private static ISettings AppSettings + { + get + { + return CrossSettings.Current; + } + } + + #region Setting Constants + + private const string SettingsKey = "settings_key"; + private static readonly string SettingsDefault = string.Empty; + + #endregion + + + public static string GeneralSettings + { + get + { + return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault); + } + set + { + AppSettings.AddOrUpdateValue(SettingsKey, value); + } + } + + } +}*/ \ No newline at end of file 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 a9f11f6b9..19e23b105 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj @@ -1,6 +1,7 @@  - + + Debug iPhoneSimulator @@ -22,11 +23,9 @@ prompt 4 false - x86_64 + i386, x86_64 None True - - False False False @@ -60,8 +59,6 @@ Entitlements.plist iPhone Developer true - - None @@ -108,124 +105,57 @@ + - - ..\..\..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll - - - ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll - - - ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll - - - ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll - - - ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll - - - ..\..\..\..\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\Validation.2.2.8\lib\dotnet\Validation.dll + + + + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + ..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + + ..\..\..\..\packages\xunit.runner.devices.2.3.3\lib\xamarinios10\xunit.runner.devices.dll + + + ..\..\..\..\packages\xunit.runner.devices.2.3.3\lib\xamarinios10\xunit.runner.utility.netstandard15.dll - - ..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll + ..\..\..\..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll + + + ..\..\..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll - ..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll + ..\..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll - ..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\xamarinios\xunit.execution.dotnet.dll - - - ..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll + ..\..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\netstandard1.1\xunit.execution.dotnet.dll - - ..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll - - - - - ..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll + + ..\..\..\..\packages\Autofac.4.6.2\lib\netstandard1.1\Autofac.dll + - ..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - - - ..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll + ..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll - - - ..\..\..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll - - - ..\..\..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.dll - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll - - - ..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll - - - ..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Platform.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll - - - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.dll @@ -233,19 +163,12 @@ - {f7b6a162-bc4d-4924-b16a-713f9b0344e7} + {FDD910BC-DF0F-483D-B7D5-C7D831855172} eShopOnContainers.UnitTests - - - - - 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}. - - - - - + + + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config deleted file mode 100644 index c578f779e..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs deleted file mode 100644 index ce6ce8f96..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs +++ /dev/null @@ -1,120 +0,0 @@ -using Xunit; -using Xamarin.Forms; -using System; -using System.Globalization; - -namespace eShopOnContainers.UnitTests -{ - public class EventToCommandBehaviorTests - { - [Fact] - public void InvalidEventNameShouldThrowArgumentExceptionText() - { - var behavior = new MockEventToCommandBehavior - { - EventName = "OnItemTapped" - }; - var listView = new ListView(); - - Assert.Throws(() => listView.Behaviors.Add(behavior)); - } - - [Fact] - public void CommandExecutedWhenEventFiresText() - { - bool executedCommand = false; - var behavior = new MockEventToCommandBehavior - { - EventName = "ItemTapped", - Command = new Command(() => - { - executedCommand = true; - }) - }; - var listView = new ListView(); - listView.Behaviors.Add(behavior); - - behavior.RaiseEvent(listView, null); - - Assert.True(executedCommand); - } - - [Fact] - public void CommandCanExecuteTest() - { - var behavior = new MockEventToCommandBehavior - { - EventName = "ItemTapped", - Command = new Command(() => Assert.True(false), () => false) - }; - var listView = new ListView(); - listView.Behaviors.Add(behavior); - - behavior.RaiseEvent(listView, null); - } - - [Fact] - public void CommandCanExecuteWithParameterShouldNotExecuteTest() - { - bool shouldExecute = false; - var behavior = new MockEventToCommandBehavior - { - EventName = "ItemTapped", - CommandParameter = shouldExecute, - Command = new Command(o => Assert.True(false), o => o.Equals(true)) - }; - var listView = new ListView(); - listView.Behaviors.Add(behavior); - - behavior.RaiseEvent(listView, null); - } - - [Fact] - public void CommandWithConverterTest() - { - const string item = "ItemProperty"; - bool executedCommand = false; - var behavior = new MockEventToCommandBehavior - { - EventName = "ItemTapped", - EventArgsConverter = new ItemTappedEventArgsConverter(false), - Command = new Command(o => - { - executedCommand = true; - Assert.NotNull(o); - Assert.Equal(item, o); - }) - }; - var listView = new ListView(); - listView.Behaviors.Add(behavior); - - behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item)); - - Assert.True(executedCommand); - } - - private class ItemTappedEventArgsConverter : IValueConverter - { - private readonly bool _returnParameter; - - public bool HasConverted { get; private set; } - - public ItemTappedEventArgsConverter(bool returnParameter) - { - _returnParameter = returnParameter; - } - - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - HasConverted = true; - return _returnParameter ? parameter : (value as ItemTappedEventArgs)?.Item; - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } - } - -} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Helpers/PropertyChangeTracker.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Helpers/PropertyChangeTracker.cs new file mode 100644 index 000000000..347a3a707 --- /dev/null +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Helpers/PropertyChangeTracker.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; + +namespace eShopOnContainers.UnitTests.Helpers +{ + public class PropertyChangeTracker + { + List _notifications = new List(); + + public PropertyChangeTracker(INotifyPropertyChanged changer) + { + changer.PropertyChanged += (sender, e) => _notifications.Add(e.PropertyName + ".Value"); + } + + //public string[] ChangedProperties + //{ + // get { return _notifications.ToArray(); } + //} + + public bool WaitForChange(string propertyName, int maxWaitMilliSeconds) + { + var startTime = DateTime.UtcNow; + while (!_notifications.Contains(propertyName)) + { + if (startTime.AddMilliseconds(maxWaitMilliSeconds) < DateTime.UtcNow) + return false; + + } + return true; + } + + public bool WaitForChange(string propertyName, TimeSpan maxWait) + { + var startTime = DateTime.UtcNow; + while (!_notifications.Contains(propertyName)) + { + if (startTime + maxWait < DateTime.UtcNow) + return false; + + } + return true; + } + + public void Reset() + { + _notifications.Clear(); + } + } +} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs deleted file mode 100644 index 64acab458..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs +++ /dev/null @@ -1,53 +0,0 @@ -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Validations; - -namespace eShopOnContainers.UnitTests -{ - public class MockViewModel : ViewModelBase - { - private ValidatableObject _forename; - private ValidatableObject _surname; - - public ValidatableObject Forename - { - get - { - return _forename; - } - set - { - _forename = value; - RaisePropertyChanged(() => Forename); - } - } - - public ValidatableObject Surname - { - get - { - return _surname; - } - set - { - _surname = value; - RaisePropertyChanged(() => Surname); - } - } - - public MockViewModel() - { - _forename = new ValidatableObject(); - _surname = new ValidatableObject(); - - _forename.Validations.Add(new IsNotNullOrEmptyRule { ValidationMessage = "Forename is required." }); - _surname.Validations.Add(new IsNotNullOrEmptyRule { ValidationMessage = "Surname name is required." }); - } - - public bool Validate() - { - bool isValidForename = _forename.Validate(); - bool isValidSurname = _surname.Validate(); - return isValidForename && isValidSurname; - } - } -} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Properties/AssemblyInfo.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 5b7977843..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Resources; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// La información general de un ensamblado se controla mediante el siguiente -// conjunto de atributos. Cambie estos valores de atributo para modificar la información -// asociada con un ensamblado. -[assembly: AssemblyTitle("eShopOnContainers.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("eShopOnContainers.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("es")] - -// La información de versión de un ensamblado consta de los cuatro valores siguientes: -// -// Versión principal -// Versión secundaria -// Número de compilación -// Revisión -// -// Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión -// mediante el carácter '*', como se muestra a continuación: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/BasketServiceTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/BasketServiceTests.cs deleted file mode 100644 index a14ce5ee0..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/BasketServiceTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -using eShopOnContainers.Core.Services.Catalog; -using System.Threading.Tasks; -using Xunit; - -namespace eShopOnContainers.UnitTests -{ - public class BasketServiceTests - { - [Fact] - public async Task GetFakeBasketTest() - { - var catalogMockService = new CatalogMockService(); - var result = await catalogMockService.GetCatalogAsync(); - Assert.NotEqual(0, result.Count); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/CatalogServiceTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/CatalogServiceTests.cs deleted file mode 100644 index 75045d36b..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/CatalogServiceTests.cs +++ /dev/null @@ -1,36 +0,0 @@ -using eShopOnContainers.Core.Services.Catalog; -using System.Threading.Tasks; -using Xunit; - -namespace eShopOnContainers.UnitTests -{ - public class CatalogServiceTests - { - [Fact] - public async Task GetFakeCatalogTest() - { - var catalogMockService = new CatalogMockService(); - var catalog = await catalogMockService.GetCatalogAsync(); - - Assert.NotEqual(0, catalog.Count); - } - - [Fact] - public async Task GetFakeCatalogBrandTest() - { - var catalogMockService = new CatalogMockService(); - var catalogBrand = await catalogMockService.GetCatalogBrandAsync(); - - Assert.NotEqual(0, catalogBrand.Count); - } - - [Fact] - public async Task GetFakeCatalogTypeTest() - { - var catalogMockService = new CatalogMockService(); - var catalogType = await catalogMockService.GetCatalogTypeAsync(); - - Assert.NotEqual(0, catalogType.Count); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs deleted file mode 100644 index 14f3bf4cc..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace eShopOnContainers.UnitTests.Services -{ - using System.Threading.Tasks; - using Core; - using Core.Helpers; - using Core.Services.Marketing; - using Xunit; - - public class MarketingServiceTests - { - [Fact] - public async Task GetFakeCampaigTest() - { - var campaignMockService = new CampaignMockService(); - var order = await campaignMockService.GetCampaignByIdAsync(1, GlobalSetting.Instance.AuthToken); - - Assert.NotNull(order); - } - - [Fact] - public async Task GetFakeCampaignsTest() - { - var campaignMockService = new CampaignMockService(); - var result = await campaignMockService.GetAllCampaignsAsync(GlobalSetting.Instance.AuthToken); - - Assert.NotEqual(0, result.Count); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/OrdersServiceTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/OrdersServiceTests.cs deleted file mode 100644 index f8411ef6f..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/OrdersServiceTests.cs +++ /dev/null @@ -1,28 +0,0 @@ -using eShopOnContainers.Core; -using eShopOnContainers.Core.Services.Order; -using System.Threading.Tasks; -using Xunit; - -namespace eShopOnContainers.UnitTests -{ - public class OrdersServiceTests - { - [Fact] - public async Task GetFakeOrderTest() - { - var ordersMockService = new OrderMockService(); - var order = await ordersMockService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken); - - Assert.NotNull(order); - } - - [Fact] - public async Task GetFakeOrdersTest() - { - var ordersMockService = new OrderMockService(); - var result = await ordersMockService.GetOrdersAsync(GlobalSetting.Instance.AuthToken); - - Assert.NotEqual(0, result.Count); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs deleted file mode 100644 index c1d4deaec..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs +++ /dev/null @@ -1,223 +0,0 @@ -using Xunit; -using eShopOnContainers.Core.ViewModels; -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Services.Catalog; -using eShopOnContainers.Core.Models.Catalog; -using System.Threading.Tasks; -using System.Linq; - -namespace eShopOnContainers.UnitTests -{ - public class CatalogViewModelTests - { - public CatalogViewModelTests() - { - ViewModelLocator.RegisterDependencies(true); - } - - [Fact] - public void AddCatalogItemCommandIsNotNullTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.NotNull(catalogViewModel.AddCatalogItemCommand); - } - - [Fact] - public void FilterCommandIsNotNullTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.NotNull(catalogViewModel.FilterCommand); - } - - [Fact] - public void ClearFilterCommandIsNotNullTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.NotNull(catalogViewModel.ClearFilterCommand); - } - - [Fact] - public void ProductsPropertyIsNullWhenViewModelInstantiatedTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.Null(catalogViewModel.Products); - } - - [Fact] - public void BrandsPropertyuIsNullWhenViewModelInstantiatedTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.Null(catalogViewModel.Brands); - } - - [Fact] - public void BrandPropertyIsNullWhenViewModelInstantiatedTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.Null(catalogViewModel.Brand); - } - - [Fact] - public void TypesPropertyIsNullWhenViewModelInstantiatedTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.Null(catalogViewModel.Types); - } - - [Fact] - public void TypePropertyIsNullWhenViewModelInstantiatedTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.Null(catalogViewModel.Type); - } - - [Fact] - public void IsFilterPropertyIsFalseWhenViewModelInstantiatedTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - Assert.False(catalogViewModel.IsFilter); - } - - [Fact] - public async Task ProductsPropertyIsNotNullAfterViewModelInitializationTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - await catalogViewModel.InitializeAsync(null); - - Assert.NotNull(catalogViewModel.Products); - } - - [Fact] - public async Task BrandsPropertyIsNotNullAfterViewModelInitializationTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - await catalogViewModel.InitializeAsync(null); - - Assert.NotNull(catalogViewModel.Brands); - } - - [Fact] - public async Task TypesPropertyIsNotNullAfterViewModelInitializationTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - await catalogViewModel.InitializeAsync(null); - - Assert.NotNull(catalogViewModel.Types); - } - - [Fact] - public async Task SettingProductsPropertyShouldRaisePropertyChanged() - { - bool invoked = false; - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - catalogViewModel.PropertyChanged += (sender, e) => - { - if (e.PropertyName.Equals("Products")) - invoked = true; - }; - await catalogViewModel.InitializeAsync(null); - - Assert.True(invoked); - } - - [Fact] - public async Task SettingBrandsPropertyShouldRaisePropertyChanged() - { - bool invoked = false; - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - catalogViewModel.PropertyChanged += (sender, e) => - { - if (e.PropertyName.Equals("Brands")) - invoked = true; - }; - await catalogViewModel.InitializeAsync(null); - - Assert.True(invoked); - } - - [Fact] - public async Task SettingTypesPropertyShouldRaisePropertyChanged() - { - bool invoked = false; - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - catalogViewModel.PropertyChanged += (sender, e) => - { - if (e.PropertyName.Equals("Types")) - invoked = true; - }; - await catalogViewModel.InitializeAsync(null); - - Assert.True(invoked); - } - - [Fact] - public void AddCatalogItemCommandSendsAddProductMessageTest() - { - bool messageReceived = false; - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - Xamarin.Forms.MessagingCenter.Subscribe(this, MessageKeys.AddProduct, (sender, arg) => - { - messageReceived = true; - }); - catalogViewModel.AddCatalogItemCommand.Execute(null); - - Assert.True(messageReceived); - } - - [Fact] - public async Task FilterCommandSendsFilterMessageTest() - { - bool messageReceived = false; - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - await catalogViewModel.InitializeAsync(null); - catalogViewModel.Brand = catalogViewModel.Brands.FirstOrDefault(); - catalogViewModel.Type = catalogViewModel.Types.FirstOrDefault(); - - Xamarin.Forms.MessagingCenter.Subscribe(this, MessageKeys.Filter, (sender) => - { - messageReceived = true; - }); - catalogViewModel.FilterCommand.Execute(null); - - Assert.True(messageReceived); - } - - [Fact] - public async Task ClearFilterCommandResetsPropertiesTest() - { - var catalogService = new CatalogMockService(); - var catalogViewModel = new CatalogViewModel(catalogService); - - await catalogViewModel.InitializeAsync(null); - catalogViewModel.ClearFilterCommand.Execute(null); - - Assert.Null(catalogViewModel.Brand); - Assert.Null(catalogViewModel.Type); - Assert.NotNull(catalogViewModel.Products); - } - } -} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs deleted file mode 100644 index 1ccffcd34..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Xunit; -using eShopOnContainers.Core.ViewModels; -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Models.Navigation; -using System.Threading.Tasks; - -namespace eShopOnContainers.UnitTests -{ - public class MainViewModelTests - { - public MainViewModelTests() - { - ViewModelLocator.RegisterDependencies(true); - } - - [Fact] - public void SettingsCommandIsNotNullWhenViewModelInstantiatedTest() - { - var mainViewModel = new MainViewModel(); - Assert.NotNull(mainViewModel.SettingsCommand); - } - - [Fact] - public async Task ViewModelInitializationSendsChangeTabMessageTest() - { - bool messageReceived = false; - var mainViewModel = new MainViewModel(); - var tabParam = new TabParameter { TabIndex = 2 }; - - Xamarin.Forms.MessagingCenter.Subscribe(this, MessageKeys.ChangeTab, (sender, arg) => - { - messageReceived = true; - }); - await mainViewModel.InitializeAsync(tabParam); - - Assert.True(messageReceived); - } - - [Fact] - public void IsBusyPropertyIsFalseWhenViewModelInstantiatedTest() - { - var mainViewModel = new MainViewModel(); - Assert.False(mainViewModel.IsBusy); - } - - [Fact] - public async Task IsBusyPropertyIsTrueAfterViewModelInitializationTest() - { - var mainViewModel = new MainViewModel(); - await mainViewModel.InitializeAsync(null); - Assert.True(mainViewModel.IsBusy); - } - } -} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs deleted file mode 100644 index 248e39857..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs +++ /dev/null @@ -1,62 +0,0 @@ -namespace eShopOnContainers.UnitTests.ViewModels -{ - using System.Threading.Tasks; - using Xunit; - using Core.ViewModels.Base; - using Core.Services.Marketing; - using Core.ViewModels; - - public class MarketingViewModelTests - { - public MarketingViewModelTests() - { - ViewModelLocator.RegisterDependencies(true); - } - - [Fact] - public void GetCampaignsIsNullTest() - { - var campaignService = new CampaignMockService(); - var campaignViewModel = new CampaignViewModel(campaignService); - Assert.Null(campaignViewModel.Campaigns); - } - - [Fact] - public async Task GetCampaignsIsNotNullTest() - { - var campaignService = new CampaignMockService(); - var campaignViewModel = new CampaignViewModel(campaignService); - - await campaignViewModel.InitializeAsync(null); - - Assert.NotNull(campaignViewModel.Campaigns); - } - - [Fact] - public void GetCampaignDetailsCommandIsNotNullTest() - { - var campaignService = new CampaignMockService(); - var campaignViewModel = new CampaignViewModel(campaignService); - Assert.NotNull(campaignViewModel.GetCampaignDetailsCommand); - } - - [Fact] - public void GetCampaignDetailsByIdIsNullTest() - { - var campaignService = new CampaignMockService(); - var campaignViewModel = new CampaignDetailsViewModel(campaignService); - Assert.Null(campaignViewModel.Campaign); - } - - [Fact] - public async Task GetCampaignDetailsByIdIsNotNullTest() - { - var campaignService = new CampaignMockService(); - var campaignDetailsViewModel = new CampaignDetailsViewModel(campaignService); - - await campaignDetailsViewModel.InitializeAsync(1); - - Assert.NotNull(campaignDetailsViewModel.Campaign); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs deleted file mode 100644 index 82312bc69..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs +++ /dev/null @@ -1,113 +0,0 @@ -using Xunit; -using eShopOnContainers.Core.ViewModels.Base; - -namespace eShopOnContainers.UnitTests -{ - public class MockViewModelTests - { - public MockViewModelTests() - { - ViewModelLocator.RegisterDependencies(true); - } - - [Fact] - public void CheckValidationFailsWhenPropertiesAreEmptyTest() - { - var mockViewModel = new MockViewModel(); - - bool isValid = mockViewModel.Validate(); - - Assert.False(isValid); - Assert.Null(mockViewModel.Forename.Value); - Assert.Null(mockViewModel.Surname.Value); - Assert.False(mockViewModel.Forename.IsValid); - Assert.False(mockViewModel.Surname.IsValid); - Assert.NotEmpty(mockViewModel.Forename.Errors); - Assert.NotEmpty(mockViewModel.Surname.Errors); - } - - [Fact] - public void CheckValidationFailsWhenOnlyForenameHasDataTest() - { - var mockViewModel = new MockViewModel(); - mockViewModel.Forename.Value = "John"; - - bool isValid = mockViewModel.Validate(); - - Assert.False(isValid); - Assert.NotNull(mockViewModel.Forename.Value); - Assert.Null(mockViewModel.Surname.Value); - Assert.True(mockViewModel.Forename.IsValid); - Assert.False(mockViewModel.Surname.IsValid); - Assert.Empty(mockViewModel.Forename.Errors); - Assert.NotEmpty(mockViewModel.Surname.Errors); - } - - [Fact] - public void CheckValidationPassesWhenOnlySurnameHasDataTest() - { - var mockViewModel = new MockViewModel(); - mockViewModel.Surname.Value = "Smith"; - - bool isValid = mockViewModel.Validate(); - - Assert.False(isValid); - Assert.Null(mockViewModel.Forename.Value); - Assert.NotNull(mockViewModel.Surname.Value); - Assert.False(mockViewModel.Forename.IsValid); - Assert.True(mockViewModel.Surname.IsValid); - Assert.NotEmpty(mockViewModel.Forename.Errors); - Assert.Empty(mockViewModel.Surname.Errors); - } - - [Fact] - public void CheckValidationPassesWhenBothPropertiesHaveDataTest() - { - var mockViewModel = new MockViewModel(); - mockViewModel.Forename.Value = "John"; - mockViewModel.Surname.Value = "Smith"; - - bool isValid = mockViewModel.Validate(); - - Assert.True(isValid); - Assert.NotNull(mockViewModel.Forename.Value); - Assert.NotNull(mockViewModel.Surname.Value); - Assert.True(mockViewModel.Forename.IsValid); - Assert.True(mockViewModel.Surname.IsValid); - Assert.Empty(mockViewModel.Forename.Errors); - Assert.Empty(mockViewModel.Surname.Errors); - } - - [Fact] - public void SettingForenamePropertyShouldRaisePropertyChanged() - { - bool invoked = false; - var mockViewModel = new MockViewModel(); - - mockViewModel.Forename.PropertyChanged += (sender, e) => - { - if (e.PropertyName.Equals("Value")) - invoked = true; - }; - mockViewModel.Forename.Value = "John"; - - Assert.True(invoked); - } - - [Fact] - public void SettingSurnamePropertyShouldRaisePropertyChanged() - { - bool invoked = false; - var mockViewModel = new MockViewModel(); - - mockViewModel.Surname.PropertyChanged += (sender, e) => - { - if (e.PropertyName.Equals("Value")) - invoked = true; - }; - mockViewModel.Surname.Value = "Smith"; - - Assert.True(invoked); - } - } -} diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs deleted file mode 100644 index fbfc6a951..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Xunit; -using eShopOnContainers.Core; -using eShopOnContainers.Core.ViewModels; -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Services.Order; -using System.Threading.Tasks; - -namespace eShopOnContainers.UnitTests -{ - public class OrderViewModelTests - { - public OrderViewModelTests() - { - ViewModelLocator.RegisterDependencies(true); - } - - [Fact] - public void OrderPropertyIsNullWhenViewModelInstantiatedTest() - { - var orderService = new OrderMockService(); - var orderViewModel = new OrderDetailViewModel(orderService); - Assert.Null(orderViewModel.Order); - } - - [Fact] - public async Task OrderPropertyIsNotNullAfterViewModelInitializationTest() - { - var orderService = new OrderMockService(); - var orderViewModel = new OrderDetailViewModel(orderService); - - var order = await orderService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken); - await orderViewModel.InitializeAsync(order); - - Assert.NotNull(orderViewModel.Order); - } - - [Fact] - public async Task SettingOrderPropertyShouldRaisePropertyChanged() - { - bool invoked = false; - var orderService = new OrderMockService(); - var orderViewModel = new OrderDetailViewModel(orderService); - - orderViewModel.PropertyChanged += (sender, e) => - { - if (e.PropertyName.Equals("Order")) - invoked = true; - }; - var order = await orderService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken); - await orderViewModel.InitializeAsync(order); - - Assert.True(invoked); - } - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/app.config b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/app.config deleted file mode 100644 index 8460dd432..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj deleted file mode 100644 index e69a6340b..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj +++ /dev/null @@ -1,61 +0,0 @@ - - - - Debug - AnyCPU - {6E4285E7-7611-4440-A1B5-3513EBB13807} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - Library - eShopOnContainers.UnitTests - eShopOnContainers.UnitTests - v4.5 - Profile111 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - - - true - bin\Release - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} - eShopOnContainers.Core - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/project.json deleted file mode 100644 index 6bd8da4a8..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Xamarin.Forms": "2.5.0.91635", - "xunit": "2.2.0", - "xunit.runner.console": "2.2.0" - }, - "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile111": {} - } -} \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs index 7be067fe3..bdd0e4308 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs @@ -5,40 +5,40 @@ using Plugin.Settings.Abstractions; namespace eShopOnContainers.iOS.Helpers { - /// - /// This is the Settings static class that can be used in your Core solution or in any - /// of your client applications. All settings are laid out the same exact way with getters - /// and setters. - /// - public static class Settings - { - private static ISettings AppSettings - { - get - { - return CrossSettings.Current; - } - } + /// + /// This is the Settings static class that can be used in your Core solution or in any + /// of your client applications. All settings are laid out the same exact way with getters + /// and setters. + /// + public static class Settings + { + private static ISettings AppSettings + { + get + { + return CrossSettings.Current; + } + } - #region Setting Constants + #region Setting Constants - private const string SettingsKey = "settings_key"; - private static readonly string SettingsDefault = string.Empty; + private const string SettingsKey = "settings_key"; + private static readonly string SettingsDefault = string.Empty; - #endregion + #endregion - public static string GeneralSettings - { - get - { - return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault); - } - set - { - AppSettings.AddOrUpdateValue(SettingsKey, value); - } - } + public static string GeneralSettings + { + get + { + return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault); + } + set + { + AppSettings.AddOrUpdateValue(SettingsKey, value); + } + } - } + } }*/ \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj index bbbb5e000..e8835f81b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -101,7 +101,6 @@ - @@ -121,11 +120,12 @@ - + + @@ -134,117 +134,57 @@ - - ..\..\..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll - True - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.dll - True - - - ..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll - True - - - ..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll - - - ..\..\..\..\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 - True - - - ..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll - True - - - ..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll - True - - - ..\..\..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll - - - ..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll - - - ..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll - - - ..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll - - - ..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll - True - - - ..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll - True - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll - True - - - ..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll - True - - - ..\..\..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll - True - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll - True - - - ..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll - True - - - ..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll - - - ..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll - - - ..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll - - - ..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll - - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + + + ..\..\..\..\packages\WebP.Touch.1.0.7\lib\Xamarin.iOS10\WebP.Touch.dll + + + ..\..\..\..\packages\Xamarin.FFImageLoading.2.3.4\lib\Xamarin.iOS10\FFImageLoading.dll + + + ..\..\..\..\packages\Xamarin.FFImageLoading.2.3.4\lib\Xamarin.iOS10\FFImageLoading.Platform.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.3.4\lib\Xamarin.iOS10\FFImageLoading.Forms.dll - ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll + ..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.3.4\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll + + + ..\..\..\..\packages\SlideOverKit.2.1.5\lib\Xamarin.iOS10\SlideOverKit.dll + + + ..\..\..\..\packages\SlideOverKit.2.1.5\lib\Xamarin.iOS10\SlideOverKit.iOS.dll + + + ..\..\..\..\packages\Autofac.4.6.2\lib\netstandard1.1\Autofac.dll + + + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll + + + ..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.dll + + + + ..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll @@ -433,18 +373,11 @@ - - {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} + + {42527749-70D5-4A44-85B4-33C4E34C7C53} eShopOnContainers.Core - - - 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}. - - - - - + \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config deleted file mode 100644 index c8179599b..000000000 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/Base/AnimationBase.cs b/src/eShopOnContainers.Core/Animations/Base/AnimationBase.cs similarity index 100% rename from src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/Base/AnimationBase.cs rename to src/eShopOnContainers.Core/Animations/Base/AnimationBase.cs diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/Base/EasingType.cs b/src/eShopOnContainers.Core/Animations/Base/EasingType.cs similarity index 100% rename from src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/Base/EasingType.cs rename to src/eShopOnContainers.Core/Animations/Base/EasingType.cs diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/FadeToAnimation.cs b/src/eShopOnContainers.Core/Animations/FadeToAnimation.cs similarity index 100% rename from src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/FadeToAnimation.cs rename to src/eShopOnContainers.Core/Animations/FadeToAnimation.cs diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/StoryBoard.cs b/src/eShopOnContainers.Core/Animations/StoryBoard.cs similarity index 100% rename from src/Mobile/eShopOnContainers/eShopOnContainers.Core/Animations/StoryBoard.cs rename to src/eShopOnContainers.Core/Animations/StoryBoard.cs diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml b/src/eShopOnContainers.Core/App.xaml similarity index 97% rename from src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml rename to src/eShopOnContainers.Core/App.xaml index 481c5c100..367946ca8 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml +++ b/src/eShopOnContainers.Core/App.xaml @@ -180,13 +180,13 @@ - + TargetType="{x:Type Label}"> + + + +