Merge Netcore2

.env

@@ -8,8 +8,8 @@ ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
 ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
 
 #ESHOP_AZURE_REDIS_BASKET_DB=<YourAzureRedisBasketInfo>
-#ESHOP_AZURE_STORAGE_CATALOG=<YourAzureStorageCatalog>
+#ESHOP_AZURE_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>
-#ESHOP_AZURE_STORAGE_MARKETING=<YourAzureStorageMarketing>
+#ESHOP_AZURE_STORAGE_MARKETING_URL=<YourAzureStorage_Marketing__BLOB_URL>
 #ESHOP_AZURE_SERVICE_BUS=<YourAzureServiceBusInfo>
 #ESHOP_AZURE_COSMOSDB=<YourAzureCosmosDBConnData>
 #ESHOP_AZURE_CATALOG_DB=<YourAzureSQLDBCatalogDBConnString>

.gitattributes

@@ -2,6 +2,7 @@
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
 * text=auto
+*.sh text eol=lf
 
 ###############################################################################
 # Set default behavior for command prompt diff.

README.md

@@ -2,6 +2,9 @@
 Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers. <p>
 **Note for Pull Requests**: We accept pull request from the community. When doing it, please do it onto the DEV branch which is the consolidated work-in-progress branch. Do not request it onto Master, if possible.
 
+## Moving to .NET Core 2.0 "wave"
+NOTE: During August/September 2017 we'll be moving the solution to .NET Core "wave". Not just compilation but also new recommended code in EF Core 2.0, ASP.NET Core 2.0, and other new related versions.
+
 >**PLEASE** Read our [branch guide](./branch-guide.md) to know about our branching policy
 
 > ### DISCLAIMER

cli-linux/build-bits-linux.sh

@@ -16,7 +16,6 @@ declare -a projectList=(
     "$path/Services/Location/Locations.API"
     "$path/Services/Marketing/Marketing.API"
     "$path/Services/Payment/Payment.API"
-    "$path/Services/GracePeriod/GracePeriodManager"
     "$path/Web/WebMVC"
     "$path/Web/WebStatus"
 )
@@ -32,9 +31,9 @@ do
     pushd $path/$project
     rm -rf obj/Docker/publish
     echo -e "\e[33m\tRestoring project $project"
-    dotnet restore
+    dotnet restore --verbosity minimal
     echo -e "\e[33m\tBuilding and publishing $project"
-    dotnet publish -o obj/Docker/publish
+    dotnet publish -c Release -o obj/Docker/publish --verbosity minimal
     popd
 done
 

cli-mac/build-bits.sh

@@ -25,7 +25,7 @@ do
     echo -e "\e[33m\tRestoring project"
     dotnet restore
     echo -e "\e[33m\tBuilding and publishing projects"
-    dotnet publish -o obj/Docker/publish
+    dotnet publish -o obj/Docker/publish -c Release
     popd
 done
 

cli-windows/build-bits.ps1

@@ -8,6 +8,9 @@ if ([string]::IsNullOrEmpty($rootPath)) {
 }
 Write-Host "Root path used is $rootPath" -ForegroundColor Yellow
 
+workflow BuildAndPublish {
+    param ([string] $rootPath
+    )
 $projectPaths = 
     @{Path="$rootPath\src\Web\WebMVC";Prj="WebMVC.csproj"},
     @{Path="$rootPath\src\Web\WebSPA";Prj="WebSPA.csproj"},
@@ -15,25 +18,25 @@ $projectPaths =
     @{Path="$rootPath\src\Services\Catalog\Catalog.API";Prj="Catalog.API.csproj"},
     @{Path="$rootPath\src\Services\Ordering\Ordering.API";Prj="Ordering.API.csproj"},
     @{Path="$rootPath\src\Services\Basket\Basket.API";Prj="Basket.API.csproj"},
-    @{Path="$rootPath\src\Services\GracePeriod\GracePeriodManager";Prj="GracePeriodManager.csproj"},
     @{Path="$rootPath\src\Services\Location\Locations.API";Prj="Locations.API.csproj"},
     @{Path="$rootPath\src\Services\Marketing\Marketing.API";Prj="Marketing.API.csproj"},
     @{Path="$rootPath\src\Services\Payment\Payment.API";Prj="Payment.API.csproj"},
     @{Path="$rootPath\src\Web\WebStatus";Prj="WebStatus.csproj"}
 
-$projectPaths | foreach {
+    foreach -parallel ($item in $projectPaths) {
-    $projectPath = $_.Path
+        $projectPath = $item.Path
-    $projectFile = $_.Prj
+        $projectFile = $item.Prj
-    $outPath = $_.Path + "\obj\Docker\publish"
+        $outPath = $item.Path + "\obj\Docker\publish"
         $projectPathAndFile = "$projectPath\$projectFile"
-    Write-Host "Deleting old publish files in $outPath" -ForegroundColor Yellow
+        #Write-Host "Deleting old publish files in $outPath" -ForegroundColor Yellow
         remove-item -path $outPath -Force -Recurse -ErrorAction SilentlyContinue
-    Write-Host "Publishing $projectPathAndFile to $outPath" -ForegroundColor Yellow
+        #Write-Host "Publishing $projectPathAndFile to $outPath" -ForegroundColor Yellow
-    dotnet restore $projectPathAndFile
         dotnet build $projectPathAndFile
-    dotnet publish $projectPathAndFile -o $outPath
+        dotnet publish $projectPathAndFile -o $outPath -c Release
+    }
 }
 
+BuildAndPublish $rootPath
 
 ########################################################################################
 # Delete old eShop Docker images

cli-windows/delete-vs-and-eshop-images.ps1

@@ -0,0 +1,46 @@
+ # Delete all containers
+ Write-Host "Deleting all running containers in the local Docker Host"
+ docker rm $(docker ps -a -q) -f
+
+$eShopImagesToDelete = docker images --filter=reference="eshop/*" -q
+If (-Not $eShopImagesToDelete) {Write-Host "Not deleting eShop images as there are no eShop images in the current local Docker repo."} 
+Else 
+{    
+    # Delete all eshop images
+    Write-Host "Deleting eShop images in local Docker repo"
+    Write-Host $eShopImagesToDelete
+    docker rmi $(docker images --filter=reference="eshop/*" -q) -f
+}
+
+$VSImagesToDelete = docker images --filter=reference="catalog.api:dev" -q
+If (-Not $VSImagesToDelete) {Write-Host "Not deleting VS images as there are no VS images in the current local Docker repo."} 
+Else 
+{    
+    # Delete all eshop images
+    Write-Host "Deleting images created by VS in local Docker repo"
+    Write-Host $VSImagesToDelete
+    docker rmi $(docker images --filter=reference="*:dev" -q) -f
+    
+    #docker rmi $(docker images --filter=reference="eshop/payment.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/webspa:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/webmvc:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/catalog.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/marketing.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/ordering.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/basket.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/identity.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/locations.api:dev" -q) -f
+    #docker rmi $(docker images --filter=reference="eshop/webstatus:dev" -q) -f
+}
+
+# DELETE ALL IMAGES AND CONTAINERS
+
+# Delete all containers
+# docker rm $(docker ps -a -q) -f
+
+# Delete all images
+# docker rmi $(docker images -q)
+
+#Filter by image name (Has to be complete, cannot be a wildcard)
+#docker ps -q  --filter=ancestor=eshop/identity.api:dev
+

cli-windows/start-windows-containers.ps1

@@ -1,9 +1,16 @@
-Param([string] $rootPath)
+Param(
+    [parameter(Mandatory=$false)][string] $rootPath,
+    [parameter(Mandatory=$false)][bool]$buildBits=$true
+)
+
 $scriptPath = Split-Path $script:MyInvocation.MyCommand.Path
 if ([string]::IsNullOrEmpty($rootPath)) {
     $rootPath = "$scriptPath\.."
 }
 Write-Host "Root path used is $rootPath" -ForegroundColor Yellow
 
-& .\build-bits.ps1 -rootPath $rootPath
+
-docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose-windows.override.yml"  up
+if ($buildBits) {
+    & $scriptPath\build-bits.ps1 -rootPath $rootPath
+}
+docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose.override.yml"  up

deploy/az/azurefunctions/azurefunctionsdeploy.parameters.json

@@ -1,5 +1,9 @@
 {
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",	
-      "parameters": {}	
+      "parameters": {
+        "SitesEshopfunctionsName": {
+            "value": "eshopfunctionsapp"
+        }
+    }
 }

deploy/az/azurefunctions/readme.md

@@ -4,20 +4,22 @@ The ARM template `azurefunctionsdeploy.json` and its parameter file (`azurefunct
 
 ## Editing azurefunctionsdeploy.parameters.json file
 
-You can edit the `azurefunctionsdeploy.parameters.parameters.json` file to set your values, but is not needed. 
+You can edit the `azurefunctionsdeploy.parameters.parameters.json` file to set your values, but is not needed. The only parameter that can be set is:
+
+1. `SitesEshopfunctionsName` is a string that is used to create the Azure function app name. 
 
 ## Deploy the template
 
 Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
 
-i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+i. e. if you are in Windows, to deploy the Azure Functions environment in a new resourcegroup located in westus, go to `deploy\az` folder and type:
 
 ```
 create-resources.cmd azurefunctions\azurefunctionsdeploy newResourceGroup -c westus
 ```
 ## Deploy Marketing azure function with Visual Studio.
 
-Alternatively, instead of using ARM templates, you can deploy Marketing azure function directly by publishing the project Marketing-functions in eShopOnContainers-AzureFunctions.sln with Visual Studio publish tool.
+You need to deploy the Marketing azure function from Visual Studio 2017 15.3 from the the Marketing-functions project in the solution  eShopOnContainers-AzureFunctions.sln (Visual Studio publish tool).
 
 ## Setting Azure function configurations
 

deploy/az/cosmos/readme.md

@@ -0,0 +1,31 @@
+# Deploying Azure Cosmosdb
+
+The ARM template `deploycosmos.json` and its parameter file (`deploycosmos.parameters.json`) are used to deploy following resources:
+
+1. One Cosmosdb database
+
+## Editing deploycosmos.parameters.json file
+
+You can edit the `deploycosmos.parameters.json` file to set your values, but is not needed. The only parameter that can
+be set is:
+
+1. `name` is a string that is used to create the database name. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
+
+i. e. if you are in windows, to deploy a Cosmosdb database in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd cosmos\deploycosmos newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+

deploy/az/redis/readme.md

@@ -15,7 +15,7 @@ be set is:
 
 Once parameter file is edited you can deploy it using [create-resources script](../readme.md).
 
-i. e. if you are in windows, to deploy sql databases in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+i. e. if you are in windows, to deploy a Redis cache in a new Azure Resource Group located in westus, go to `deploy\az` folder and type:
 
 ```
 create-resources.cmd redis\redisdeploy newResourceGroup -c westus

deploy/az/storage/catalog/deploystorage.json

@@ -7,11 +7,14 @@
     },
     "profileName" : {
       "type": "string"
+    },
+    "endpointName" : {
+      "type": "string"
     }
   },
   "variables": {
     "catalogstorage": "[concat(parameters('catalogstorage'), uniqueString(resourceGroup().id))]",
-    "endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
+    "endpointName": "[concat(parameters('endpointName'), uniqueString(resourceGroup().id))]",
     "profileName": "[parameters('profileName')]"
   },
   "resources": [

deploy/az/storage/catalog/deploystorage.parameters.json

@@ -7,6 +7,9 @@
     },
     "profileName":{
       "value": "eshopcatalog"
+    },
+   "endpointName":{
+      "value": "catalog-endpoint"
     }
   }
 }

deploy/az/storage/catalog/readme.md

@@ -0,0 +1,37 @@
+# Deploying Catalog Storage 
+
+The ARM template `deploystorage.json` and its parameter file (`deploystorage.parameters.json`) are used to deploy following resources:
+
+1. One Storage Account
+2. One CDN profile
+3. One Endpoint
+
+## Editing deploystorage.parameters.json file
+
+You can edit the `deploystorage.parameters.json` file to set your values, but is not needed. The only parameters that can
+be set are:
+
+1. `catalogstorage` is a string that is used to create the storage account name. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+2. `profileName` is a string that is used to create the CDN profile name.
+
+3. `endpointName` is a string that is used to create the storage endpoint name. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../../readme.md).
+
+i. e. if you are in windows, to deploy a Storage Account in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd catalog\deploystorage newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+

deploy/az/storage/marketing/deploystorage.json

@@ -7,11 +7,14 @@
     },
     "profileName" : {
       "type": "string"
+    },
+        "endpointName" : {
+      "type": "string"
     }
   },
   "variables": {
     "marketingstorage": "[concat(parameters('marketingstorage'), uniqueString(resourceGroup().id))]",
-    "endpointName": "[concat('endpoint-', uniqueString(resourceGroup().id))]",
+    "endpointName": "[concat(parameters('endpointName'), uniqueString(resourceGroup().id))]",
     "profileName": "[parameters('profileName')]"
   },
   "resources": [

deploy/az/storage/marketing/deploystorage.parameters.json

@@ -7,6 +7,9 @@
     },
     "profileName":{
       "value": "eshopmarketing"
+    },
+   "endpointName":{
+      "value": "marketing-endpoint"
     }
   }
 }

deploy/az/storage/marketing/readme.md

@@ -0,0 +1,37 @@
+# Deploying Marketing Storage 
+
+The ARM template `deploystorage.json` and its parameter file (`deploystorage.parameters.json`) are used to deploy following resources:
+
+1. One Storage Account
+2. One CDN profile
+3. One Endpoint
+
+## Editing deploystorage.parameters.json file
+
+You can edit the `deploystorage.parameters.json` file to set your values, but is not needed. The only parameters that can
+be set are:
+
+1. `marketingstorage` is a string that is used to create the storage account name. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+2. `profileName` is a string that is used to create the CDN profile name.
+
+3. `endpointName` is a string that is used to create the storage endpoint name. ARM script creates unique values by appending a unique string to this parameter value, so you can leave the default value.
+
+## Deploy the template
+
+Once parameter file is edited you can deploy it using [create-resources script](../../readme.md).
+
+i. e. if you are in windows, to deploy a Storage account in a new resourcegroup located in westus, go to `deploy\az` folder and type:
+
+```
+create-resources.cmd marketing\deploystorage newResourceGroup -c westus
+```
+
+
+
+
+
+
+
+
+

deploy/readme.md

@@ -20,6 +20,10 @@ Using `docker-machine` is the recommended way to create a VM with docker install
 1. [Deploying SQL Server and databases](az/sql/readme.md)
 2. [Deploying Azure Service Bus](az/servicebus/readme.md)
 3. [Deploying Redis Cache](az/redis/readme.md)
+4. [Deploying Cosmosdb](az/cosmos/readme.md)
+5. [Deploying Catalog Storage](az/storage/catalog/readme.md)
+6. [Deploying Marketing Storage](az/storage/marketing/readme.md)
+7. [Deploying Marketing Azure functions](az/azurefunctions/readme.md)
 
 
 

docker-compose-windows.override.yml

@@ -1,169 +0,0 @@
-version: '2.1'
-
-# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. 
-# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 
-#     ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
-# but values present in the environment vars at runtime will always override those defined inside the .env file
-# An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
-
-services:
-
-  basket.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-      - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5103:80"
-
-  catalog.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
-      - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
-      - UseCustomizationData=True
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5101:80"
-
-  identity.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
-      - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback      #localhost do not work for UWP login, so we have to use "external" IP always
-      - ConnectionStrings__DefaultConnection=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word} 
-      - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
-      - LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
-      - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
-      - BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
-      - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
-      - UseCustomizationData=True
-    ports:
-      - "5105:80"
-
-  ordering.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-      - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - UseCustomizationData=True
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5102:80"
-
-  webspa:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101
-      - OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
-      - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
-      - BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
-      - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - UseCustomizationData=True
-    ports:
-      - "5104:80"
-
-  webmvc:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api
-      - OrderingUrl=http://ordering.api
-      - BasketUrl=http://basket.api
-      - IdentityUrl=http://10.0.75.1:5105
-      - MarketingUrl=http://marketing.api  #Local:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser.                                                  
-      - UseCustomizationData=True   #Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. 
-    ports:
-      - "5100:80"
-
-  sql.data:
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5433:1433"
-
-  nosql.data:
-    ports:
-      - "27017:27017"
-
-  locations.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
-      - Database=LocationsDb
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
-      - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5109:80"
-
-  marketing.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
-      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
-      - MongoDatabase=MarketingDb
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-      - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-      - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
-      - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
-      - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5110:80"
-    
-  graceperiodmanager:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureServiceBusEnabled=False
-
-  webstatus:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api/hc
-      - OrderingUrl=http://ordering.api/hc
-      - BasketUrl=http://basket.api/hc
-      - IdentityUrl=http://identity.api/hc
-      - LocationsUrl=http://locations.api/hc
-      - MarketingUrl=http://marketing.api/hc
-      - mvc=http://webmvc/hc
-      - spa=http://webspa/hc
-    ports:
-      - "5107:80"
-
-  payment.api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureServiceBusEnabled=False
-    ports:
-      - "5108:80"

docker-compose-windows.prod.yml

@@ -21,6 +21,7 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - AzureServiceBusEnabled=False
     ports:
       - "5103:5103"
 
@@ -29,11 +30,13 @@ services:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
+      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
       - UseCustomizationData=True
+      - AzureServiceBusEnabled=False
+      - AzureStorageEnabled=False
     ports:
       - "5101:80"
 
@@ -62,6 +65,7 @@ services:
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - UseCustomizationData=True
+      - AzureServiceBusEnabled=False
     ports:
       - "5102:80"
 
@@ -92,6 +96,7 @@ services:
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
       - BasketUrl=http://basket.api
       - MarketingUrl=http://marketing.api
+      - UseCustomizationData=True   #Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. 
     ports:
       - "5100:80"
   
@@ -106,19 +111,14 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING}
+      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
+      - AzureServiceBusEnabled=False
+      - AzureStorageEnabled=False
     ports:
       - "5110:80"
 
-  graceperiodmanager:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-
   sql.data:
     environment:
       - SA_PASSWORD=Pass@word
@@ -151,6 +151,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:5108
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - AzureServiceBusEnabled=False
     ports:
       - "5108:80"
 
@@ -163,5 +164,6 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - AzureServiceBusEnabled=False
     ports:
       - "5109:80"

docker-compose-windows.yml

@@ -5,7 +5,7 @@ services:
     image: eshop/basket.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Basket/Basket.API
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
       - basket.data
       - identity.api
@@ -15,7 +15,7 @@ services:
     image: eshop/catalog.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Catalog/Catalog.API
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
       - sql.data
       - rabbitmq
@@ -24,7 +24,7 @@ services:
     image: eshop/identity.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Identity/Identity.API
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
       - sql.data
 
@@ -32,25 +32,39 @@ services:
     image: eshop/ordering.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Ordering/Ordering.API
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
       - sql.data
       - rabbitmq
 
+  marketing.api:
+    image: eshop/marketing.api:${TAG:-latest}
+    build:
+      context: ./src/Services/Marketing/Marketing.API
+      dockerfile: Dockerfile    
+    depends_on:
+      - sql.data
+      - nosql.data
+      - identity.api
+      - rabbitmq      
+
   webspa:
     image: eshop/webspa-win:${TAG:-latest}
     build:
       context: ./src/Web/WebSPA
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
+      - catalog.api
+      - ordering.api
       - identity.api
       - basket.api
+      - marketing.api
 
   webmvc:
     image: eshop/webmvc-win:${TAG:-latest}
     build:
       context: ./src/Web/WebMVC
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
       - catalog.api
       - ordering.api
@@ -62,28 +76,25 @@ services:
     image: eshop/webstatus:${TAG:-latest}
     build:
       context: ./src/Web/WebStatus
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
+
+  payment.api:
+    image: eshop/payment.api:${TAG:-latest}
+    build:
+      context: ./src/Services/Payment/Payment.API
+      dockerfile: Dockerfile
+    depends_on:
+      - rabbitmq         
 
   locations.api:
     image: eshop/locations.api:${TAG:-latest}
     build:
       context: ./src/Services/Location/Locations.API
-      dockerfile: Dockerfile.nanowin
+      dockerfile: Dockerfile
     depends_on:
       - nosql.data
       - rabbitmq
 
-  marketing.api:
-    image: eshop/marketing.api:${TAG:-latest}
-    build:
-      context: ./src/Services/Marketing/Marketing.API
-      dockerfile: Dockerfile.nanowin    
-    depends_on:
-      - sql.data
-      - nosql.data
-      - identity.api
-      - rabbitmq
-
   sql.data:
     image: microsoft/mssql-server-windows
   
@@ -94,7 +105,7 @@ services:
     image: redis:nanoserver
 #    build:
 #      context: ./_docker/redis
-#      dockerfile: Dockerfile.nanowin
+#      dockerfile: Dockerfile
     ports:
         - "6379:6379"
 
@@ -102,27 +113,11 @@ services:
     image: spring2/rabbitmq
 #    build:
 #      context: ./_docker/rabbitmq
-#      dockerfile: Dockerfile.nanowin  
+#      dockerfile: Dockerfile  
     ports:
+      - "15672:15672"    
       - "5672:5672"
 
-  graceperiodmanager:
-    image: eshop/graceperiodmanager:${TAG:-latest}
-    build:
-      context: ./src/Services/GracePeriod/GracePeriodManager
-      dockerfile: Dockerfile.nanowin
-    depends_on:
-      - sql.data
-      - rabbitmq
-
-  payment.api:
-    image: eshop/payment.api:${TAG:-latest}
-    build:
-      context: ./src/Services/Payment/Payment.API
-      dockerfile: Dockerfile.nanowin
-    depends_on:
-      - rabbitmq   
-
 networks:
   default:
     external:

docker-compose.ci.build.yml

@@ -2,7 +2,7 @@ version: '2.1'
 
 services:
   ci-build:
-    image: microsoft/aspnetcore-build:1.1.2
+    image: microsoft/aspnetcore-build:2.0
     volumes:
       - .:/src
       - ./cli-linux:/cli-linux
@@ -11,8 +11,8 @@ services:
 #   Next line is using the .sln file to compile all the projects. 
 #   Sometime there is an issue in msbuild exits the process before finishing building the bits: (https://github.com/Microsoft/msbuild/issues/2153)
 #   Random error: error MSB4017: The build stopped unexpectedly be cause of an unexpected logger failure.
-    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish"
+    #command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet restore ./eShopOnContainers-ServicesAndWebApps.sln  --verbosity minimal && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish --verbosity minimal"
 
 #    NOTE: Using build-bits-linux.sh from Linux build container exits before ending.
-#    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src"
+    command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src"
     

docker-compose.dcproj

@@ -15,12 +15,6 @@
     </None>
     <None Include="docker-compose.prod.yml">
       <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
-	<None Include="docker-compose.vs.debug.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
-    <None Include="docker-compose.vs.release.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
     </None>
     <None Include="docker-compose.yml" />
   </ItemGroup>

docker-compose.override.yml

@@ -25,12 +25,13 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
+      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
+      - AzureStorageEnabled=False
     ports:
       - "5101:80"
 
@@ -60,6 +61,8 @@ services:
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
+      - GracePeriodTime=1
+      - CheckUpdateTime=30000
     ports:
       - "5102:80"
 
@@ -74,21 +77,14 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
+      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
       - AzureServiceBusEnabled=False
+      - AzureStorageEnabled=False
     ports:
       - "5110:80"
 
-  graceperiodmanager:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureServiceBusEnabled=False
-
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -121,17 +117,6 @@ services:
     ports:
       - "5100:80"
 
-  sql.data:
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5433:1433"
-
-  nosql.data:
-    ports:
-      - "27017:27017"
-
   webstatus:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
@@ -168,3 +153,14 @@ services:
       - AzureServiceBusEnabled=False
     ports:
       - "5109:80"
+
+  sql.data:
+    environment:
+      - SA_PASSWORD=Pass@word
+      - ACCEPT_EULA=Y
+    ports:
+      - "5433:1433"
+
+  nosql.data:
+    ports:
+      - "27017:27017"

docker-compose.prod.yml

@@ -21,6 +21,7 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - AzureServiceBusEnabled=False
     ports:
       - "5103:80"
 
@@ -29,11 +30,13 @@ services:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
+      - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
       - UseCustomizationData=True
+      - AzureServiceBusEnabled=False
+      - AzureStorageEnabled=False
     ports:
       - "5101:80"
 
@@ -62,6 +65,7 @@ services:
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - UseCustomizationData=True
+      - AzureServiceBusEnabled=False
     ports:
       - "5102:80"
 
@@ -76,19 +80,14 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
-      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING}
+      - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_MARKETING_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_MARKETING_KEY}
+      - AzureServiceBusEnabled=False
+      - AzureStorageEnabled=False
     ports:
       - "5110:80"
 
-  graceperiodmanager:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Production
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
-      - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-
   webspa:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
@@ -113,9 +112,11 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - CatalogUrl=http://catalog.api
       - OrderingUrl=http://ordering.api
-      - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
       - BasketUrl=http://basket.api
-      - MarketingUrl=http://marketing.api
+      - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.    
+      - MarketingUrl=http://marketing.api  #Local:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. 
+                                                 #Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. 
+      - UseCustomizationData=True
     ports:
       - "5100:80"
 
@@ -151,6 +152,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:5108
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - AzureServiceBusEnabled=False
     ports:
       - "5108:80"
 
@@ -163,5 +165,6 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - AzureServiceBusEnabled=False
     ports:
       - "5109:80"

docker-compose.vs.debug.yml

@@ -1,166 +0,0 @@
-version: '2.1'
-
-services:
-  basket.api:
-    image: eshop/basket.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Basket/Basket.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  catalog.api:
-    image: eshop/catalog.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Catalog/Catalog.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  identity.api:
-    image: eshop/identity.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Identity/Identity.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  ordering.api:
-    image: eshop/ordering.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Ordering/Ordering.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  marketing.api:
-    image: eshop/marketing.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Marketing/Marketing.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-
-  webspa:
-    image: eshop/webspa:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Web/WebSPA:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  webmvc:
-    image: eshop/webmvc:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Web/WebMVC:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  webstatus:
-    image: eshop/webstatus:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Web/WebStatus:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  payment.api:
-    image: eshop/payment.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Payment/Payment.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  graceperiodmanager:
-    image: eshop/graceperiodmanager:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ./src/Services/GracePeriod/GracePeriodManager:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  locations.api:
-    image: eshop/locations.api:dev
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    environment:
-      - DOTNET_USE_POLLING_FILE_WATCHER=1
-    volumes:
-      - ./src/Services/Location/Locations.API:/app
-      - ~/.nuget/packages:/root/.nuget/packages:ro
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"

docker-compose.vs.release.yml

@@ -1,112 +0,0 @@
-version: '2.1'
-
-services:
-  basket.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  catalog.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  identity.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  ordering.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  marketing.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  webspa:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  webmvc:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  webstatus:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  payment.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  graceperiodmanager:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"
-
-  locations.api:
-    build:
-      args:
-        source: ${DOCKER_BUILD_SOURCE}
-    volumes:
-      - ~/clrdbg:/clrdbg:ro
-    entrypoint: tail -f /dev/null
-    labels:
-      - "com.microsoft.visualstudio.targetoperatingsystem=linux"

docker-compose.yml

@@ -49,23 +49,17 @@ services:
       - identity.api
       - rabbitmq
 
-  graceperiodmanager:
-    image: eshop/graceperiodmanager:${TAG:-latest}
-    build:
-      context: ./src/Services/GracePeriod/GracePeriodManager
-      dockerfile: Dockerfile
-    depends_on:
-      - sql.data
-      - rabbitmq
-
   webspa:
     image: eshop/webspa:${TAG:-latest}
     build:
       context: ./src/Web/WebSPA
       dockerfile: Dockerfile    
     depends_on:
+      - catalog.api
+      - ordering.api
       - identity.api
       - basket.api
+      - marketing.api
 
   webmvc:
     image: eshop/webmvc:${TAG:-latest}
@@ -79,22 +73,6 @@ services:
       - basket.api
       - marketing.api
 
-  sql.data:
-    image: microsoft/mssql-server-linux
-
-  nosql.data:
-    image: mongo
-
-  basket.data:
-    image: redis
-    ports:
-      - "6379:6379"
-
-  rabbitmq:
-    image: rabbitmq
-    ports:
-      - "5672:5672"
-
   webstatus:
     image: eshop/webstatus:${TAG:-latest}
     build:
@@ -117,3 +95,20 @@ services:
     depends_on:
       - nosql.data
       - rabbitmq
+
+  sql.data:
+    image: microsoft/mssql-server-linux
+
+  nosql.data:
+    image: mongo
+
+  basket.data:
+    image: redis
+    ports:
+      - "6379:6379"
+      
+  rabbitmq:
+    image: rabbitmq:3-management
+    ports:
+      - "15672:15672"
+      - "5672:5672"

eShopOnContainers-Android.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
 EndProject

eShopOnContainers-AzureFunctions.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26608.5
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{5B1011EC-CEE5-47AA-B336-99381D573679}"
 EndProject

eShopOnContainers-MobileApps.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
 EndProject
@@ -473,6 +473,8 @@ Global
 		{A7337243-33B8-463A-87AD-944B75EFD820}.AppStore|x86.Build.0 = Release|x86
 		{A7337243-33B8-463A-87AD-944B75EFD820}.AppStore|x86.Deploy.0 = Release|x86
 		{A7337243-33B8-463A-87AD-944B75EFD820}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A7337243-33B8-463A-87AD-944B75EFD820}.Debug|Any CPU.Build.0 = Debug|x86
+		{A7337243-33B8-463A-87AD-944B75EFD820}.Debug|Any CPU.Deploy.0 = Debug|x86
 		{A7337243-33B8-463A-87AD-944B75EFD820}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A7337243-33B8-463A-87AD-944B75EFD820}.Debug|ARM.Build.0 = Debug|ARM
 		{A7337243-33B8-463A-87AD-944B75EFD820}.Debug|ARM.Deploy.0 = Debug|ARM

eShopOnContainers-ServicesAndWebApps.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
 EndProject
@@ -81,8 +81,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Health
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventBus.Tests", "src\BuildingBlocks\EventBus\EventBus.Tests\EventBus.Tests.csproj", "{4A980AC4-7205-46BF-8CCB-09E44D700FD4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GracePeriodManager", "src\Services\GracePeriod\GracePeriodManager\GracePeriodManager.csproj", "{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Location", "Location", "{41139F64-4046-4F16-96B7-D941D96FA9C6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Locations.API", "src\Services\Location\Locations.API\Locations.API.csproj", "{E7581357-FC34-474C-B8F5-307EE3CE05EF}"
@@ -1079,54 +1077,6 @@ Global
 		{4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x64.Build.0 = Release|Any CPU
 		{4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x86.ActiveCfg = Release|Any CPU
 		{4A980AC4-7205-46BF-8CCB-09E44D700FD4}.Release|x86.Build.0 = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x64.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.AppStore|x86.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|ARM.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x64.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Debug|x86.Build.0 = Debug|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|ARM.Build.0 = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhone.Build.0 = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x64.Build.0 = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x86.ActiveCfg = Release|Any CPU
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47}.Release|x86.Build.0 = Release|Any CPU
 		{E7581357-FC34-474C-B8F5-307EE3CE05EF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{E7581357-FC34-474C-B8F5-307EE3CE05EF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{E7581357-FC34-474C-B8F5-307EE3CE05EF}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -1505,7 +1455,6 @@ Global
 		{22A0F9C1-2D4A-4107-95B7-8459E6688BC5} = {A81ECBC2-6B00-4DCD-8388-469174033379}
 		{4BD76717-3102-4969-8C2C-BAAA3F0263B6} = {A81ECBC2-6B00-4DCD-8388-469174033379}
 		{4A980AC4-7205-46BF-8CCB-09E44D700FD4} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
-		{F6E0F0DD-1400-43C3-B5E0-7CC325728C47} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 		{41139F64-4046-4F16-96B7-D941D96FA9C6} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
 		{E7581357-FC34-474C-B8F5-307EE3CE05EF} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
 		{88B22DBB-AA8F-4290-A454-2C109352C345} = {DB0EFB20-B024-4E5E-A75C-52143C131D25}
@@ -1517,4 +1466,7 @@ Global
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
 		{983EAB84-65C5-4793-A300-08F97C791A15} = {0D1E7D4E-12DD-4B67-9595-7C0BD347F8C8}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}
+	EndGlobalSection
 EndGlobal

eShopOnContainers-iOS.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
 EndProject

eShopOnContainers.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
 	ProjectSection(ProjectDependencies) = postProject

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version":"1.0.4"
+        "version":"2.0.2"
     }
 }

k8s/README.k8s.md

@@ -58,6 +58,12 @@ The script accepts following parameters:
 + `deployInfrastructure`: If `true` infrastructure containers (rabbitmq, mongo, redis, sql) will be deployed in k8s. If `false` those containers (and its related deployments and services in k8s) won't be deployed.
 + `dockerOrg`: Name of the organization in the registry where the images are (or will be pushed). Default value is `eshop` (which has images provided by Microsoft)
 
+**Important:** If you **don't pass the `-buildBits $true` the script won't build and publish the projects** to their `obj/Docker/publish` folder. If any project is not published, you'll be receiving errors like:
+
+```
+ERROR: Service 'xxxxxxx' failed to build: COPY failed: stat /var/lib/docker/tmp/docker-builder123456789/obj/Docker/publish: no such file or directory
+```
+
 ### Typical usages of the script:
 
 Build all projects, and deploy all them in k8s including infrastructure containers in a organization called `foo` in Docker Hub. Images will be tagged with my current git branch and containers will use the configuration set in `conf_local.yml` file:

k8s/readme.md

@@ -9,4 +9,4 @@ Refer to file [README.k8s.md](./README.k8s.md) for detailed information
 
 Refer to file [README.CICD.k8s.md](./README.CICD.k8s.md) for information about how to set a VSTS build for deploying on k8s
 
-Refer to file [conf-files.md](./conf-files.md) for a brief descriptio of every YAML file in this folder
+Refer to file [conf-files.md](./conf-files.md) for a brief description of every YAML file in this folder

readme/readme-docker-compose.md

@@ -0,0 +1,79 @@
+# Docker-compose yaml files
+
+In the root folder of the repo are all docker-compose files (`docker-compose*.yml`). Here is a list of all of them and what is their purpose:
+
+## Container build
+
+* `docker-compose.ci.build.yml`: This file is for starting the build container to build the project using a container that has all needed prerequisites. Refer to [corresponding wiki section](https://github.com/dotnet-architecture/eShopOnContainers/wiki/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code)#build-the-bits-through-the-build-container-image) for more information.
+
+## Files needed to run eShopOnContainers locally 
+
+* `docker-compose.yml`: This file contains **the definition of all images needed for running eShopOnContainers**.
+* `docker-compose.override.yml`: This file contains the base configuration for all images of the previous file
+
+Usually these two files are using together. The standard way to start eShopOnContainers from CLI is:
+
+```
+docker-compose -f docker-compose.yml -f docker-compose.override.yml
+```
+
+This will start eShopOnContainers with all containers running locally, and it is the default development environment.
+
+## Files needed to run eShopOnContainers on a remote docker host
+
+* `docker-compose.prod.yml`: This file is a replacement of the `docker-compose.override.yml` but contains some configurations more suitable for a "production" environment or when you need to run the services using an external docker host.
+
+```
+docker-compose -f docker-compose.yml -f docker-compose.prod.yml
+```
+
+When using this file the following environments variables must be set:
+
+* `ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP` with the IP or DNS name of the docker host that runs the services (can use `localhost` if needed). 
+* `ESHOP_AZURE_STORAGE_CATALOG` with the URL of the Azure Storage that will host the catalog images
+* `ESHOP_AZURE_STORAGE_MARKETING` with the URL of the Azure Storage that will host the marketing campaign images
+
+You might wonder why an external image resource (storage) is needed when using `docker-compose.prod.yml` instead of `docker-compose.override.yml`. Answer to this is related to a limitation of Docker Compose file format. This is how we set the environment configuration of Catalog microservice in `docker-compose.override.yml`:
+
+```
+PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}
+```
+
+The `PicBaseUrl` variable is set to the value of `ESHOP_AZURE_STORAGE_CATALOG` if this variable is set to any value other than blank string. If not, the value is set to `http://localhost:5101/api/v1/catalog/items/[0]/pic/`. That works perfectly in a local environment where you run all your services in `localhost` and setting `ESHOP_AZURE_STORAGE_CATALOG` you can use or not Azure Storage for the images (if you don't use Azure Storage images are served locally by catalog servide). But when you run the services in a external docker host, specified in `ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP`, the configuration should be as follows:
+
+```
+PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101/api/v1/catalog/items/[0]/pic/}
+```
+
+So, use `ESHOP_AZURE_STORAGE_CATALOG` if set, and if not use `http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101/api/v1/catalog/items/[0]/pic/}`. Unfortunately seems that docker-compose do not substitute variables inside variables, so the value that `PicBaseUrl` gets if `ESHOP_AZURE_STORAGE_CATALOG` is not set is literally `http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101/api/v1/catalog/items/[0]/pic/}` without any substitution.
+
+**For more information** about docker-compose variable substitution read the [compose docs](https://docs.docker.com/compose/compose-file/#variable-substitution).
+
+## Other files
+
+* `docker-compose.nobuild.yml`: This file contains the definition of all images needed to run the eShopOnContainers. Contains **the same images that `docker-compose.yml`** but without any `build` instruction. If you use this file instead of `docker-compose.yml` when launching the project and you don't have the images built locally, **the images will be pulled from dockerhub**. This file is not intended for development usage, but for some CI/CD scenarios.
+* `docker-compose.vs.debug.yml`: This file is used by Docker Tools of VS2017, and should not be used directly.
+* `docker-compose.vs.release.yml`: This file is used by Docker Tools of VS2017, and should not be used directly.
+
+**Note**: The reason why we need the `docker-compose.nobuild.yml` is that [docker-compose issue #3391](https://github.com/docker/compose/issues/3391). Once solved, parameter `--no-build` of docker-compose could be used safely in a CI/CD environments and the need for this file will disappear.
+
+
+## Windows container files
+
+All `docker-compose-windows*.yml` files have a 1:1 relationship with the same file without the `-windows` in its name. Those files are used to run Windows Containers instead of Linux Containers.
+
+* `docker-compose-windows.yml`: Contains the definitions of all containers that are needed to run eShopOnContainers using windows containers (equivalent to `docker-compose.yml`).
+* `docker-compose-windows.override.yml`: Contains the base configuration for all windows containers
+
+**Note** We plan **to remove** the `docker-compose-windows.override.yml` file, because it is **exactly the same** as the `docker-compose.override.yml`. The reason of its existence is historical, but is no longer needed. You can use `docker-compose.override.yml` instead.
+
+* `docker-compose-windows.prod.yml` is the equivalent of `docker-compose.prod.yml` for containers windows. As happens with `docker-compose-windows.override.yml` this file will be deleted in a near future, so you should use `docker-compose.prod.yml` instead.
+
+## "External container" files
+
+These files were intended to provide a fast way to start only "infrastructure" containers (SQL Server, Redis, etc). *This files are deprecated and will be deleted in a near future**:
+
+* `docker-compose-external.override.yml`
+* `docker-compose-external.yml`
+
+If you want to start only certain containers use `docker-compose -f ... -f ... up container1 contaner2 containerN` as specified in [compose doc](https://docs.docker.com/compose/reference/up/)

readme/readme.md

@@ -0,0 +1,19 @@
+# Documentation index
+
+This file contains links to the documentation of the project.
+
+* **Wiki**: The wiki contains detailed step-by-step information about how to set up the project. Read it at: [https://github.com/dotnet-architecture/eShopOnContainers/wiki](https://github.com/dotnet-architecture/eShopOnContainers/wiki)
+
+## Documentation included in files
+
+* [Branch Guide](../branch-guide.md): List of branches used and their purpose.
+* [vsts-docs folder](../vsts-docs/readme.md): Information about how to setup a CI/CD procedure using VSTS
+* [Kubernetes](../k8s/readme.md): Information about how to deploy eShopOnContainers in a kubernetes cluster, and how to setup a CI/CD for k8s using VSTS
+* [deploy](../deploy/readme.md): Information about how deploy Azure resources using the Azure CLI 2.0.
+* [.env file](./README.ENV.md): What is the `.env` file and how to use it to configure eShopOnContainers to use external resources (like Azure)
+* [docker-compose files](./readme-docker-compose.md): What are all these `docker-compose-*.yml` files
+
+## Docs folder
+
+The `/docs` folder contains the pdfs versions of the books
+

src/BuildingBlocks/DataProtection/DataProtection/DataProtection.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard1.5</TargetFramework>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks</RootNamespace>
   </PropertyGroup>
 

src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>

src/BuildingBlocks/EventBus/EventBus/EventBus.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBus</RootNamespace>
   </PropertyGroup>
 
@@ -10,8 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.5.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs

@@ -11,10 +11,7 @@ using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using RabbitMQ.Client.Exceptions;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Sockets;
-using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -184,7 +181,7 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
             };
 
             channel.BasicConsume(queue: _queueName,
-                                 noAck: true,
+                                 autoAck: false,
                                  consumer: consumer);
 
             channel.CallbackException += (sender, ea) =>

src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.5.0" />
+    <PackageReference Include="Autofac" Version="4.6.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Polly" Version="5.1.0" />
+    <PackageReference Include="Polly" Version="5.3.1" />
-    <PackageReference Include="RabbitMQ.Client" Version="4.1.3" />
+    <PackageReference Include="RabbitMQ.Client" Version="5.0.1" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
 
   <ItemGroup>

src/BuildingBlocks/EventBus/EventBusServiceBus/DefaultServiceBusPersisterConnection.cs

@@ -1,7 +1,6 @@
 using Microsoft.Azure.ServiceBus;
 using Microsoft.Extensions.Logging;
 using System;
-using System.IO;
 
 namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus
 {

src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.cs

@@ -1,18 +1,16 @@
 namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus
 {
-    using System;
+    using Autofac;
+    using Microsoft.Azure.ServiceBus;
+    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
     using Microsoft.Extensions.Logging;
-    using Microsoft.Azure.ServiceBus;
     using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+    using System;
     using System.Text;
     using System.Threading.Tasks;
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
-    using System.Reflection;
-    using Microsoft.Azure.ServiceBus.Filters;
-    using Autofac;
-    using Newtonsoft.Json.Linq;
 
     public class EventBusServiceBus : IEventBus
     {
@@ -129,11 +127,25 @@
             _subscriptionClient.RegisterMessageHandler(
                 async (message, token) =>
                 {
-                    var eventName = message.Label;
+                    var eventName = $"{message.Label}{INTEGRATION_EVENT_SUFIX}";
                     var messageData = Encoding.UTF8.GetString(message.Body);
                     await ProcessEvent(eventName, messageData);
+                    
+                    // Complete the message so that it is not received again.
+                    await _subscriptionClient.CompleteAsync(message.SystemProperties.LockToken);
                 },
-               new MessageHandlerOptions() { MaxConcurrentCalls = 10, AutoComplete = true });
+               new MessageHandlerOptions(ExceptionReceivedHandler) { MaxConcurrentCalls = 10, AutoComplete = false });
+        }
+
+        private Task ExceptionReceivedHandler(ExceptionReceivedEventArgs exceptionReceivedEventArgs)
+        {
+            Console.WriteLine($"Message handler encountered an exception {exceptionReceivedEventArgs.Exception}.");
+            var context = exceptionReceivedEventArgs.ExceptionReceivedContext;
+            Console.WriteLine("Exception context for troubleshooting:");
+            Console.WriteLine($"- Endpoint: {context.Endpoint}");
+            Console.WriteLine($"- Entity Path: {context.EntityPath}");
+            Console.WriteLine($"- Executing Action: {context.Action}");
+            return Task.CompletedTask;
         }
 
         private async Task ProcessEvent(string eventName, string message)
@@ -169,13 +181,13 @@
             try
             {
                 _subscriptionClient
-                 .RemoveRuleAsync(SubscriptionClient.DefaultRule)
+                 .RemoveRuleAsync(RuleDescription.DefaultRuleName)
                  .GetAwaiter()
                  .GetResult();
             }
             catch (MessagingEntityNotFoundException)
             {
-                _logger.LogInformation($"The messaging entity {SubscriptionClient.DefaultRule} Could not be found.");
+                _logger.LogInformation($"The messaging entity { RuleDescription.DefaultRuleName } Could not be found.");
             }
         }
     }

src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="0.0.5-preview" />
+    <PackageReference Include="Autofac" Version="4.6.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Azure.ServiceBus" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/BuildingBlocks/EventBus/EventBusServiceBus/IServiceBusPersisterConnection.cs

@@ -1,7 +1,7 @@
 namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus
 {
-    using System;
     using Microsoft.Azure.ServiceBus;
+    using System;
 
     public interface IServiceBusPersisterConnection : IDisposable
     {

src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj

@@ -1,22 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
   </ItemGroup>
   
   <ItemGroup>

src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs

@@ -6,6 +6,7 @@ using System.Data.Common;
 using System.Linq;
 using System.Threading.Tasks;
 using System;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services
 {

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageTargetFallback>$(PackageTargetFallback);net46</PackageTargetFallback>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -17,11 +16,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
-    <PackageReference Include="WindowsAzure.Storage" Version="7.2.1" />
+    <PackageReference Include="WindowsAzure.Storage" Version="8.4.0" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />

src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Polly" Version="5.1.0" />
+    <PackageReference Include="Polly" Version="5.3.1" />
   </ItemGroup>
 
 </Project>

src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs

@@ -73,12 +73,12 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http
 
         public async Task<HttpResponseMessage> PostAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer")
         {
-            return await DoPostPutAsync(HttpMethod.Post, uri, item, authorizationToken, requestId, authorizationToken);
+            return await DoPostPutAsync(HttpMethod.Post, uri, item, authorizationToken, requestId, authorizationMethod);
         }
 
         public async Task<HttpResponseMessage> PutAsync<T>(string uri, T item, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer")
         {
-            return await DoPostPutAsync(HttpMethod.Put, uri, item, authorizationToken, requestId, authorizationToken);
+            return await DoPostPutAsync(HttpMethod.Put, uri, item, authorizationToken, requestId, authorizationMethod);
         }
         public async Task<HttpResponseMessage> DeleteAsync(string uri, string authorizationToken = null, string requestId = null, string authorizationMethod = "Bearer")
         {

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

@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Application xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:light="clr-namespace:Xamarin.Forms.Themes;assembly=Xamarin.Forms.Theme.Light"
              xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
              xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
              x:Class="eShopOnContainers.App">
     <Application.Resources>
-        <ResourceDictionary MergedWith="light:LightThemeResources">
+        <ResourceDictionary>
 
             <!-- COLORS -->
             <Color x:Key="WhiteColor">#ffffff</Color>
@@ -18,6 +17,69 @@
             <Color x:Key="DarkGreenColor">#00857D</Color>
             <Color x:Key="GrayColor">#e2e2e2</Color>
             <Color x:Key="ErrorColor">#ff5252</Color>
+            <Color x:Key="TextColor">#757575</Color>
+            <Color x:Key="InverseTextColor">#FFFFFF</Color>
+            <Color x:Key="LightTextColor">#979797</Color>
+            <Color x:Key="iOSDefaultTintColor">#007aff</Color>
+            <Color x:Key="SeparatorLineColor">#CCCCCC</Color>
+            <Color x:Key="AndroidDefaultButtonClassBackgroundColor">#C9C9C9</Color>
+            <Color x:Key="iOSDefaultButtonClassBackgroundColor">Transparent</Color>
+            <Color x:Key="AndroidDefaultButtonClassBorderColor">Transparent</Color>
+            <Color x:Key="iOSDefaultButtonClassBorderColor">#007aff</Color>
+            <Color x:Key="AndroidDefaultButtonClassTextColor">#FFFFFF</Color>
+            <Color x:Key="iOSDefaultButtonClassTextColor">#007aff</Color>
+            <Color x:Key="AndroidEntryBackgroundColor">Transparent</Color>
+            <Color x:Key="iOSEntryBackgroundColor">#FFFFFF</Color>
+            <Color x:Key="AndroidDefaultAccentColorColor">#1FAECE</Color>
+            <Color x:Key="AndroidListViewBackgroundColor">Transparent</Color>
+            <Color x:Key="iOSListViewBackgroundColor">Transparent</Color>
+
+            <OnPlatform 
+                x:TypeArguments="Color"
+                x:Key="ActivityIndicatorColor"
+                iOS="{ StaticResource iOSDefaultTintColor }" />
+
+            <OnPlatform
+                x:TypeArguments="Color"
+                x:Key="DefaultButtonClassBackgroundColor"
+                Android="{ StaticResource AndroidDefaultButtonClassBackgroundColor }"
+                iOS="{ StaticResource iOSDefaultButtonClassBackgroundColor }" />
+
+            <OnPlatform
+                x:TypeArguments="Color"
+                x:Key="DefaultButtonClassBorderColor"
+                Android="{ StaticResource AndroidDefaultButtonClassBorderColor }"
+                iOS="{ StaticResource iOSDefaultButtonClassBorderColor }" />
+
+            <OnPlatform
+                x:TypeArguments="Color"
+                x:Key="DefaultButtonClassTextColor"
+                Android="{ StaticResource AndroidDefaultButtonClassTextColor }"
+                iOS="{ StaticResource iOSDefaultButtonClassTextColor }" />
+
+            <OnPlatform
+                x:TypeArguments="Color"
+                x:Key="EntryBackgroundColor"
+                Android="{ StaticResource AndroidEntryBackgroundColor }"
+                iOS="{ StaticResource iOSEntryBackgroundColor }" />
+
+            <OnPlatform
+                x:TypeArguments="Color"
+                x:Key="ThemeListViewBackgroundColor"
+                Android="{ StaticResource AndroidListViewBackgroundColor }"
+                iOS="{ StaticResource iOSListViewBackgroundColor }" />
+
+            <!-- SIZES -->
+            <OnPlatform 
+                x:TypeArguments="x:Double"
+                x:Key="BaseButtonBorderRadius"
+                iOS="6" />
+
+            <OnPlatform 
+                x:TypeArguments="x:Double"
+                x:Key="BaseButtonBorderWidth"
+                Android="0"
+                iOS="0" />
             
             <!-- FONTS -->
             <OnPlatform 
@@ -41,7 +103,18 @@
                 Android="SourceSansPro-Regular.ttf#Source Sans Pro"
                 WinPhone="Assets/Fonts/SourceSansPro-Regular.ttf#Source Sans Pro"/>
             
-            <!-- FONT SIZES -->
+            <OnPlatform
+                x:TypeArguments="x:Double"
+                x:Key="BaseButtonFontSize"
+                Android="16"
+                iOS="18" />
+
+            <OnPlatform
+                x:TypeArguments="x:Double"
+                x:Key="BaseFontSize"
+                Android="15"
+                iOS="16" />
+            
             <OnPlatform 
                 x:Key="LittleSize"
                 x:TypeArguments="x:Double"
@@ -98,22 +171,23 @@
                 Android="48"
                 WinPhone="48"/>
 
+            <OnPlatform
+                x:TypeArguments="FontAttributes"
+                x:Key="BaseButtonFontAttributes"
+                Android="None"
+                iOS="Bold" />
+            
             <!-- CONVERTERS -->
             <converters:CountToBoolConverter x:Key="CountToBoolConverter" />
             <converters:DatetimeConverter x:Key="DatetimeConverter" />
-			<converters:FirstValidationErrorConverter x:Key="FirstValidationErrorConverter" />
             <converters:ImageConverter x:Key="ImageConverter" />
             <converters:ItemTappedEventArgsConverter x:Key="ItemTappedEventArgsConverter" />
             <converters:InverseCountToBoolConverter x:Key="InverseCountToBoolConverter" />
             <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
             <converters:ItemsToHeightConverter x:Key="ItemsToHeightConverter" />
             <converters:ToUpperConverter x:Key="ToUpperConverter" />
-            <converters:WebNavigatingEventArgsConverter x:Key="WebNavigatingEventArgsConverter" />
-            <converters:WebNavigatedEventArgsConverter x:Key="WebNavigatedEventArgsConverter" />
-            <converters:StringNullOrEmptyBoolConverter x:Key="StringNullOrEmptyBoolConverter" />
-            <converters:DoubleConverter x:Key="DoubleConverter" />
 
-            <!-- STYLES -->
+            <!-- EXPLICIT STYLES -->
             <Style x:Key="ValidationErrorLabelStyle"
 				   TargetType="{x:Type Label}">
 				   <Setter Property="TextColor"
@@ -186,6 +260,47 @@
                 </Style.Triggers>
             </Style>
 
+            <!-- IMPLICIT STYLES -->
+            <Style TargetType="Button" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="FontSize" Value="{ StaticResource BaseButtonFontSize }" />
+                <Setter Property="FontAttributes" Value="{ StaticResource BaseButtonFontAttributes }" />
+                <Setter Property="BorderRadius" Value="{ StaticResource BaseButtonBorderRadius }" />
+                <Setter Property="BorderWidth" Value="{ StaticResource BaseButtonBorderWidth }" />
+                <Setter Property="BackgroundColor" Value="{ StaticResource DefaultButtonClassBackgroundColor }" />
+                <Setter Property="BorderColor" Value="{ StaticResource DefaultButtonClassBorderColor }" />
+                <Setter Property="TextColor" Value="{ StaticResource DefaultButtonClassTextColor }" />
+            </Style>
+
+             <Style TargetType="Label" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="FontSize" Value="{ StaticResource BaseFontSize }" />
+            </Style>
+
+            <Style TargetType="Entry" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="TextColor" Value="{ StaticResource TextColor }" />
+                <Setter Property="PlaceholderColor" Value="{ StaticResource LightTextColor }" />
+                <Setter Property="BackgroundColor" Value="{ StaticResource EntryBackgroundColor }" />
+            </Style>
+
+            <Style TargetType="ImageCell" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="TextColor" Value="{ StaticResource InverseTextColor }" />
+                <Setter Property="DetailColor" Value="{ StaticResource AccentColor }" />
+            </Style>
+
+            <Style TargetType="TextCell" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="TextColor" Value="{ StaticResource InverseTextColor }" />
+                <Setter Property="DetailColor" Value="{ StaticResource AccentColor }" />
+            </Style>
+
+            <Style TargetType="ListView" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="BackgroundColor" Value="{ StaticResource ThemeListViewBackgroundColor }" />
+                <Setter Property="SeparatorColor" Value="{ StaticResource SeparatorLineColor }" />
+                <Setter Property="SeparatorVisibility" Value="Default" />
+            </Style>
+
+            <Style TargetType="ActivityIndicator" ApplyToDerivedTypes="True" CanCascade="True">
+                <Setter Property="Color" Value="{ StaticResource ActivityIndicatorColor }" />
+            </Style>
+            
             <Style TargetType="NavigationPage">
                 <Setter Property="BarBackgroundColor" Value="{StaticResource GreenColor}"/>
                 <Setter Property="BarTextColor" Value="{StaticResource WhiteColor}"/>

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/AddBasketButton.xaml

@@ -1,11 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <ContentView
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+    xmlns:effects="clr-namespace:eShopOnContainers.Core.Effects"
     x:Class="eShopOnContainers.Core.Controls.AddBasketButton">
     <ContentView.Resources>
         <ResourceDictionary>
 
+            <Style TargetType="BoxView" Class="Circle">
+                <Setter Property="BackgroundColor" Value="{ StaticResource AccentColor }" />
+                <Setter Property="WidthRequest" Value="34" />
+                <Setter Property="HeightRequest" Value="34" />
+                <Setter Property="HorizontalOptions" Value="Start" />
+                <Setter Property="effects:ThemeEffects.Circle" Value="True" />
+            </Style>
+            
             <Style x:Key="AddBackgroundImageStyle" 
                TargetType="{x:Type Image}">
                 <Setter Property="HorizontalOptions"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Effects/ThemeEffects.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using System.Linq;
+using Xamarin.Forms;
+
+namespace eShopOnContainers.Core.Effects
+{
+    public static class ThemeEffects
+    {
+        public static readonly BindableProperty CircleProperty =
+            BindableProperty.CreateAttached("Circle", typeof(bool), typeof(ThemeEffects), false, propertyChanged: OnChanged<CircleEffect, bool>);
+
+        public static bool GetCircle(BindableObject view)
+        {
+            return (bool)view.GetValue(CircleProperty);
+        }
+
+        public static void SetCircle(BindableObject view, bool circle)
+        {
+            view.SetValue(CircleProperty, circle);
+        }
+
+
+        private static void OnChanged<TEffect, TProp>(BindableObject bindable, object oldValue, object newValue)
+            where TEffect : Effect, new()
+        {
+            var view = bindable as View;
+            if (view == null)
+            {
+                return;
+            }
+
+            if (EqualityComparer<TProp>.Equals(newValue, default(TProp)))
+            {
+                var toRemove = view.Effects.FirstOrDefault(e => e is TEffect);
+                if (toRemove != null)
+                {
+                    view.Effects.Remove(toRemove);
+                }
+            }
+            else
+            {
+                view.Effects.Add(new TEffect());
+            }
+        }
+
+        private class CircleEffect : RoutingEffect
+        {
+            public CircleEffect()
+                : base("eShopOnContainers.CircleEffect")
+            {
+            }
+        }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/RandomNumberGenerator.cs

@@ -0,0 +1,23 @@
+using System.Text;
+
+namespace eShopOnContainers.Core.Helpers
+{
+    internal static class RandomNumberGenerator
+    {
+        public static string CreateUniqueId(int length = 64)
+        {
+            var bytes = PCLCrypto.WinRTCrypto.CryptographicBuffer.GenerateRandom(length);
+            return ByteArrayToString(bytes);
+        }
+
+        private static string ByteArrayToString(byte[] array)
+        {
+            var hex = new StringBuilder(array.Length * 2);
+            foreach (byte b in array)
+            {
+                hex.AppendFormat("{0:x2}", b);
+            }
+            return hex.ToString();
+        }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs

@@ -1,16 +1,22 @@
-using IdentityModel.Client;
+using System;
-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)
 		{
@@ -30,6 +36,8 @@ namespace eShopOnContainers.Core.Services.Identity
             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");
@@ -54,9 +62,19 @@ namespace eShopOnContainers.Core.Services.Identity
 
 		public async Task<UserToken> GetTokenAsync(string code)
 		{
-			string data = string.Format("grant_type=authorization_code&code={0}&redirect_uri={1}", code, WebUtility.UrlEncode(GlobalSetting.Instance.IdentityCallback));
+			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<UserToken>(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);
+        }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs

@@ -281,13 +281,13 @@ namespace eShopOnContainers.Core.ViewModels
             if (!UseFakeLocation)
             {
                 TitleUseFakeLocation = "Use Real Location";
-                DescriptionUseFakeLocation = "When enabling the use of real location, the app will attempt to use real location from the device.";
+                DescriptionUseFakeLocation = "When enabling location, the app will attempt to use the location from the device.";
 
             }
             else
             {
                 TitleUseFakeLocation = "Use Fake Location";
-                DescriptionUseFakeLocation = "Fake Location are added for marketing campaign testing.";
+                DescriptionUseFakeLocation = "Fake Location data is added for marketing campaign testing.";
             }
         }
 
@@ -295,13 +295,13 @@ namespace eShopOnContainers.Core.ViewModels
         {
             if (!AllowGpsLocation)
             {
-                TitleAllowGpsLocation = "GPS location Denied";
+                TitleAllowGpsLocation = "GPS Location Disabled";
-                DescriptionAllowGpsLocation = "When denying the use of device gps you won't get the location campaigns through your real location.";
+                DescriptionAllowGpsLocation = "When disabling location, you won't receive location campaigns based upon your location.";
             }
             else
             {
-                TitleAllowGpsLocation = "GPS location Allowed";
+                TitleAllowGpsLocation = "GPS Location Enabled";
-                DescriptionAllowGpsLocation = "When allowing the use of device gps you will get the location campaigns through your real location.";
+                DescriptionAllowGpsLocation = "When enabling location, you'll receive location campaigns based upon your location.";
 
             }
         }
@@ -344,7 +344,7 @@ namespace eShopOnContainers.Core.ViewModels
                 if (!locator.IsGeolocationEnabled)
                 {
                     _allowGpsLocation = false;
-                    GpsWarningMessage = "Enable your GPS system in your device";
+                    GpsWarningMessage = "Enable the GPS sensor on your device";
                 }
                 else
                 {

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml

@@ -2,11 +2,14 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="eShopOnContainers.Core.Views.CampaignDetailsView"
+             xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
 			 xmlns:viewModelBase="clr-namespace:eShopOnContainers.Core.ViewModels.Base;assembly=eShopOnContainers.Core"
 			 viewModelBase:ViewModelLocator.AutoWireViewModel="true"
              Title="Campaign Details">
     <ContentPage.Resources>
         <ResourceDictionary>
+            <converters:StringNullOrEmptyBoolConverter x:Key="StringNullOrEmptyBoolConverter" />
+            
             <Style x:Key="CampaignTitleStyle" 
                    TargetType="{x:Type Label}">
                 <Setter Property="FontFamily"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml

@@ -4,6 +4,7 @@
              x:Class="eShopOnContainers.Core.Views.LoginView"
 		 	 xmlns:viewModelBase="clr-namespace:eShopOnContainers.Core.ViewModels.Base;assembly=eShopOnContainers.Core"
              xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
+             xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
              xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
              xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
 			 viewModelBase:ViewModelLocator.AutoWireViewModel="true">
@@ -15,6 +16,9 @@
     </ContentPage.Title>
     <ContentPage.Resources>
         <ResourceDictionary>
+            <converters:FirstValidationErrorConverter x:Key="FirstValidationErrorConverter" />
+            <converters:WebNavigatingEventArgsConverter x:Key="WebNavigatingEventArgsConverter" />
+            <converters:WebNavigatedEventArgsConverter x:Key="WebNavigatedEventArgsConverter" />
             
             <Style x:Key="TitleLabelStyle"
                 TargetType="{x:Type Label}">
@@ -147,11 +151,6 @@
                     <Label
                         Text="REGISTER"
                         TextColor="Gray"/>
-                    <Grid.GestureRecognizers>
-                        <TapGestureRecognizer
-                          Command="{Binding RegisterCommand}"
-                          NumberOfTapsRequired="1" />
-                    </Grid.GestureRecognizers>
                 </Grid>
                 <StackLayout  
                   Grid.Column="2"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml

@@ -4,12 +4,14 @@
              x:Class="eShopOnContainers.Core.Views.SettingsView"
 			 xmlns:viewModelBase="clr-namespace:eShopOnContainers.Core.ViewModels.Base;assembly=eShopOnContainers.Core"
              xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
+             xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
              xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
              xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
 			 viewModelBase:ViewModelLocator.AutoWireViewModel="true"
              Title="Settings">
     <ContentPage.Resources>
         <ResourceDictionary>
+            <converters:DoubleConverter x:Key="DoubleConverter" />
             
             <Style x:Key="SettingsStackLayoutStyle" TargetType="{x:Type StackLayout}">
                 <Setter Property="Margin" 

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

@@ -1,320 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <PackageTargetFallback>portable-net45+win8+wpa81+wp8</PackageTargetFallback>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>eShopOnContainers.Core</RootNamespace>
-    <AssemblyName>eShopOnContainers.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="Animations\Base\AnimationBase.cs" />
+    <PackageReference Include="Acr.UserDialogs" Version="6.3.3" />
-    <Compile Include="Animations\Base\EasingType.cs" />
+    <PackageReference Include="Autofac" Version="4.5.0" />
-    <Compile Include="Animations\FadeToAnimation.cs" />
+    <PackageReference Include="IdentityModel" Version="2.10.0" />
-    <Compile Include="Animations\StoryBoard.cs" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
-    <Compile Include="App.xaml.cs">
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-      <DependentUpon>App.xaml</DependentUpon>
+    <PackageReference Include="PCLCrypto" Version="2.0.147" />
-    </Compile>
+    <PackageReference Include="SlideOverKit" Version="2.1.4" />
-    <Compile Include="Behaviors\Base\BindableBehavior.cs" />
+    <PackageReference Include="Splat" Version="1.6.2" />
-    <Compile Include="Behaviors\EventToCommandBehavior.cs" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
-    <Compile Include="Controls\AddBasketButton.xaml.cs">
+    <PackageReference Include="Xam.Plugin.Geolocator" Version="3.0.4" />
-      <DependentUpon>AddBasketButton.xaml</DependentUpon>
+    <PackageReference Include="Xam.Plugins.Settings" Version="2.6.0.12-beta" />
-    </Compile>
+    <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.2.9" />
-    <Compile Include="Controls\CustomTabbedPage.cs" />
+    <PackageReference Include="Xamarin.Forms" Version="2.3.4.231" />
-    <Compile Include="Controls\ToggleButton.cs" />
-    <Compile Include="Converters\DoubleConverter.cs" />
-    <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
-    <Compile Include="Converters\CountToBoolConverter.cs" />
-    <Compile Include="Converters\DatetimeConverter.cs" />
-    <Compile Include="Converters\ImageConverter.cs" />
-    <Compile Include="Converters\InverseBoolConverter.cs" />
-    <Compile Include="Converters\InverseCountToBoolConverter.cs" />
-    <Compile Include="Converters\ItemsToHeightConverter.cs" />
-    <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
-    <Compile Include="Converters\ToUpperConverter.cs" />
-    <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
-    <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
-    <Compile Include="Extensions\ObservableExtension.cs" />
-    <Compile Include="GlobalSettings.cs" />
-    <Compile Include="Helpers\EasingHelper.cs" />
-    <Compile Include="Helpers\ServicesHelper.cs" />
-    <Compile Include="Helpers\Settings.cs" />
-    <Compile Include="Models\Basket\BasketCheckout.cs" />
-    <Compile Include="Models\Basket\BasketItem.cs" />
-    <Compile Include="Models\Basket\CustomerBasket.cs" />
-    <Compile Include="Models\Catalog\CatalogBrand.cs" />
-    <Compile Include="Models\Catalog\CatalogItem.cs" />
-    <Compile Include="Models\Catalog\CatalogRoot.cs" />
-    <Compile Include="Models\Catalog\CatalogType.cs" />
-    <Compile Include="Models\Location\Location.cs" />
-    <Compile Include="Models\Marketing\CampaignItem.cs" />
-    <Compile Include="Models\Marketing\CampaignRoot.cs" />
-    <Compile Include="Models\Navigation\TabParameter.cs" />
-    <Compile Include="Models\Orders\CancelOrderCommand.cs" />
-    <Compile Include="Models\Orders\CardType.CS" />
-    <Compile Include="Models\Orders\Order.cs" />
-    <Compile Include="Models\Orders\OrderItem.cs" />
-    <Compile Include="Models\Orders\OrderStatus.cs" />
-    <Compile Include="Models\User\Address.cs" />
-    <Compile Include="Models\User\LogoutParameter.cs" />
-    <Compile Include="Models\User\PaymentInfo.cs" />
-    <Compile Include="Models\User\UserInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\Basket\BasketMockService.cs" />
-    <Compile Include="Services\Basket\BasketService.cs" />
-    <Compile Include="Services\Basket\IBasketService.cs" />
-    <Compile Include="Services\Catalog\CatalogMockService.cs" />
-    <Compile Include="Services\Catalog\CatalogService.cs" />
-    <Compile Include="Services\Catalog\ICatalogService.cs" />
-    <Compile Include="Services\Common\Common.cs" />
-    <Compile Include="Services\Dialog\DialogService.cs" />
-    <Compile Include="Services\Dialog\IDialogService.cs" />
-    <Compile Include="Services\Identity\IdentityService.cs" />
-    <Compile Include="Services\Identity\IIdentityService.cs" />
-    <Compile Include="Services\Location\ILocationService.cs" />
-    <Compile Include="Services\Location\LocationService.cs" />
-    <Compile Include="Services\Marketing\ICampaignService.cs" />
-    <Compile Include="Services\Marketing\CampaignMockService.cs" />
-    <Compile Include="Services\Marketing\CampaignService.cs" />
-    <Compile Include="Services\Navigation\INavigationService.cs" />
-    <Compile Include="Services\Navigation\NavigationService.cs" />
-    <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
-    <Compile Include="Services\OpenUrl\OpenUrlService.cs" />
-    <Compile Include="Services\Order\IOrderService.cs" />
-    <Compile Include="Services\Order\OrderMockService.cs" />
-    <Compile Include="Services\Order\OrderService.cs" />
-    <Compile Include="Services\RequestProvider\HttpRequestExceptionEx.cs" />
-    <Compile Include="Services\RequestProvider\IRequestProvider.cs" />
-    <Compile Include="Services\RequestProvider\RequestProvider.cs" />
-    <Compile Include="Services\User\IUserService.cs" />
-    <Compile Include="Services\User\UserMockService.cs" />
-    <Compile Include="Services\User\UserService.cs" />
-    <Compile Include="Triggers\BeginAnimation.cs" />
-    <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
-    <Compile Include="Validations\IValidationRule.cs" />
-    <Compile Include="Validations\IValidity.cs" />
-    <Compile Include="Validations\ValidatableObject.cs" />
-    <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
-    <Compile Include="ViewModels\Base\MessageKeys.cs" />
-    <Compile Include="ViewModels\Base\ViewModelBase.cs" />
-    <Compile Include="ViewModels\Base\ViewModelLocator.cs" />
-    <Compile Include="ViewModels\BasketViewModel.cs" />
-    <Compile Include="ViewModels\CampaignDetailsViewModel.cs" />
-    <Compile Include="ViewModels\CampaignViewModel.cs" />
-    <Compile Include="ViewModels\CatalogViewModel.cs" />
-    <Compile Include="ViewModels\CheckoutViewModel.cs" />
-    <Compile Include="ViewModels\LoginViewModel.cs" />
-    <Compile Include="ViewModels\MainViewModel.cs" />
-    <Compile Include="ViewModels\OrderDetailViewModel.cs" />
-    <Compile Include="ViewModels\ProfileViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
-    <Compile Include="Views\BasketView.xaml.cs">
-      <DependentUpon>BasketView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CampaignView.xaml.cs">
-      <DependentUpon>CampaignView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CatalogView.xaml.cs">
-      <DependentUpon>CatalogView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CampaignDetailsView.xaml.cs">
-      <DependentUpon>CampaignDetailsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CheckoutView.xaml.cs">
-      <DependentUpon>CheckoutView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomNavigationView.xaml.cs">
-      <DependentUpon>CustomNavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\FiltersView.xaml.cs">
-      <DependentUpon>FiltersView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\LoginView.xaml.cs">
-      <DependentUpon>LoginView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainView.xaml.cs">
-      <DependentUpon>MainView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\OrderDetailView.xaml.cs">
-      <DependentUpon>OrderDetailView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ProfileView.xaml.cs">
-      <DependentUpon>ProfileView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SettingsView.xaml.cs">
-      <DependentUpon>SettingsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
-      <DependentUpon>BasketItemTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
-      <DependentUpon>OrderItemTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\OrderTemplate.xaml.cs">
-      <DependentUpon>OrderTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
-      <DependentUpon>CampaignTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Templates\ProductTemplate.xaml.cs">
-      <DependentUpon>ProductTemplate.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
-    <Compile Include="Converters\FirstValidationErrorConverter.cs" />
-    <Compile Include="Effects\EntryLineColorEffect.cs" />
-    <Compile Include="Behaviors\LineColorBehavior.cs" />
-    <Compile Include="Models\Token\UserToken.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
+    <!-- https://bugzilla.xamarin.com/show_bug.cgi?id=55591 -->
-    <None Include="project.json" />
+    <None Remove="**\*.xaml" />
+
+    <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
+    <EmbeddedResource Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" />
   </ItemGroup>
-  <ItemGroup>
+  
-    <EmbeddedResource Include="Controls\AddBasketButton.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\BasketView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CatalogView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CheckoutView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CustomNavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\FiltersView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\LoginView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\MainView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\OrderDetailView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\ProfileView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\SettingsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="App.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CampaignView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

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

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>eShopOnContainers.Core</RootNamespace>
+    <AssemblyName>eShopOnContainers.Core</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Animations\Base\AnimationBase.cs" />
+    <Compile Include="Animations\Base\EasingType.cs" />
+    <Compile Include="Animations\FadeToAnimation.cs" />
+    <Compile Include="Animations\StoryBoard.cs" />
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Behaviors\Base\BindableBehavior.cs" />
+    <Compile Include="Behaviors\EventToCommandBehavior.cs" />
+    <Compile Include="Controls\AddBasketButton.xaml.cs">
+      <DependentUpon>AddBasketButton.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\CustomTabbedPage.cs" />
+    <Compile Include="Controls\ToggleButton.cs" />
+    <Compile Include="Converters\DoubleConverter.cs" />
+    <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
+    <Compile Include="Converters\CountToBoolConverter.cs" />
+    <Compile Include="Converters\DatetimeConverter.cs" />
+    <Compile Include="Converters\ImageConverter.cs" />
+    <Compile Include="Converters\InverseBoolConverter.cs" />
+    <Compile Include="Converters\InverseCountToBoolConverter.cs" />
+    <Compile Include="Converters\ItemsToHeightConverter.cs" />
+    <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
+    <Compile Include="Converters\ToUpperConverter.cs" />
+    <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
+    <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
+    <Compile Include="Extensions\ObservableExtension.cs" />
+    <Compile Include="GlobalSettings.cs" />
+    <Compile Include="Helpers\EasingHelper.cs" />
+    <Compile Include="Helpers\RandomNumberGenerator.cs" />
+    <Compile Include="Helpers\ServicesHelper.cs" />
+    <Compile Include="Helpers\Settings.cs" />
+    <Compile Include="Models\Basket\BasketCheckout.cs" />
+    <Compile Include="Models\Basket\BasketItem.cs" />
+    <Compile Include="Models\Basket\CustomerBasket.cs" />
+    <Compile Include="Models\Catalog\CatalogBrand.cs" />
+    <Compile Include="Models\Catalog\CatalogItem.cs" />
+    <Compile Include="Models\Catalog\CatalogRoot.cs" />
+    <Compile Include="Models\Catalog\CatalogType.cs" />
+    <Compile Include="Models\Location\Location.cs" />
+    <Compile Include="Models\Marketing\CampaignItem.cs" />
+    <Compile Include="Models\Marketing\CampaignRoot.cs" />
+    <Compile Include="Models\Navigation\TabParameter.cs" />
+    <Compile Include="Models\Orders\CancelOrderCommand.cs" />
+    <Compile Include="Models\Orders\CardType.CS" />
+    <Compile Include="Models\Orders\Order.cs" />
+    <Compile Include="Models\Orders\OrderItem.cs" />
+    <Compile Include="Models\Orders\OrderStatus.cs" />
+    <Compile Include="Models\User\Address.cs" />
+    <Compile Include="Models\User\LogoutParameter.cs" />
+    <Compile Include="Models\User\PaymentInfo.cs" />
+    <Compile Include="Models\User\UserInfo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\Basket\BasketMockService.cs" />
+    <Compile Include="Services\Basket\BasketService.cs" />
+    <Compile Include="Services\Basket\IBasketService.cs" />
+    <Compile Include="Services\Catalog\CatalogMockService.cs" />
+    <Compile Include="Services\Catalog\CatalogService.cs" />
+    <Compile Include="Services\Catalog\ICatalogService.cs" />
+    <Compile Include="Services\Common\Common.cs" />
+    <Compile Include="Services\Dialog\DialogService.cs" />
+    <Compile Include="Services\Dialog\IDialogService.cs" />
+    <Compile Include="Services\Identity\IdentityService.cs" />
+    <Compile Include="Services\Identity\IIdentityService.cs" />
+    <Compile Include="Services\Location\ILocationService.cs" />
+    <Compile Include="Services\Location\LocationService.cs" />
+    <Compile Include="Services\Marketing\ICampaignService.cs" />
+    <Compile Include="Services\Marketing\CampaignMockService.cs" />
+    <Compile Include="Services\Marketing\CampaignService.cs" />
+    <Compile Include="Services\Navigation\INavigationService.cs" />
+    <Compile Include="Services\Navigation\NavigationService.cs" />
+    <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
+    <Compile Include="Services\OpenUrl\OpenUrlService.cs" />
+    <Compile Include="Services\Order\IOrderService.cs" />
+    <Compile Include="Services\Order\OrderMockService.cs" />
+    <Compile Include="Services\Order\OrderService.cs" />
+    <Compile Include="Services\RequestProvider\HttpRequestExceptionEx.cs" />
+    <Compile Include="Services\RequestProvider\IRequestProvider.cs" />
+    <Compile Include="Services\RequestProvider\RequestProvider.cs" />
+    <Compile Include="Services\User\IUserService.cs" />
+    <Compile Include="Services\User\UserMockService.cs" />
+    <Compile Include="Services\User\UserService.cs" />
+    <Compile Include="Triggers\BeginAnimation.cs" />
+    <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
+    <Compile Include="Validations\IValidationRule.cs" />
+    <Compile Include="Validations\IValidity.cs" />
+    <Compile Include="Validations\ValidatableObject.cs" />
+    <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
+    <Compile Include="ViewModels\Base\MessageKeys.cs" />
+    <Compile Include="ViewModels\Base\ViewModelBase.cs" />
+    <Compile Include="ViewModels\Base\ViewModelLocator.cs" />
+    <Compile Include="ViewModels\BasketViewModel.cs" />
+    <Compile Include="ViewModels\CampaignDetailsViewModel.cs" />
+    <Compile Include="ViewModels\CampaignViewModel.cs" />
+    <Compile Include="ViewModels\CatalogViewModel.cs" />
+    <Compile Include="ViewModels\CheckoutViewModel.cs" />
+    <Compile Include="ViewModels\LoginViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.cs" />
+    <Compile Include="ViewModels\OrderDetailViewModel.cs" />
+    <Compile Include="ViewModels\ProfileViewModel.cs" />
+    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="Views\BasketView.xaml.cs">
+      <DependentUpon>BasketView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CampaignView.xaml.cs">
+      <DependentUpon>CampaignView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CatalogView.xaml.cs">
+      <DependentUpon>CatalogView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CampaignDetailsView.xaml.cs">
+      <DependentUpon>CampaignDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CheckoutView.xaml.cs">
+      <DependentUpon>CheckoutView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\CustomNavigationView.xaml.cs">
+      <DependentUpon>CustomNavigationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\FiltersView.xaml.cs">
+      <DependentUpon>FiltersView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\LoginView.xaml.cs">
+      <DependentUpon>LoginView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\OrderDetailView.xaml.cs">
+      <DependentUpon>OrderDetailView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProfileView.xaml.cs">
+      <DependentUpon>ProfileView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SettingsView.xaml.cs">
+      <DependentUpon>SettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
+      <DependentUpon>BasketItemTemplate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
+      <DependentUpon>OrderItemTemplate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Templates\OrderTemplate.xaml.cs">
+      <DependentUpon>OrderTemplate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
+      <DependentUpon>CampaignTemplate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Templates\ProductTemplate.xaml.cs">
+      <DependentUpon>ProductTemplate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
+    <Compile Include="Converters\FirstValidationErrorConverter.cs" />
+    <Compile Include="Effects\EntryLineColorEffect.cs" />
+    <Compile Include="Behaviors\LineColorBehavior.cs" />
+    <Compile Include="Models\Token\UserToken.cs" />
+    <Compile Include="Effects\ThemeEffects.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\AddBasketButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\BasketView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CatalogView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CheckoutView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CustomNavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\FiltersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\LoginView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\MainView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\OrderDetailView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\ProfileView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\SettingsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CampaignView.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
+  </Target>
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

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

@@ -1,26 +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",
-    "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.3.4.231",
-    "Xamarin.Forms.Pages": "2.3.4.231",
-    "Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
-    "Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"
-  },
-  "frameworks": {
-    ".NETPortable,Version=v4.5,Profile=Profile111": {}
-  }
-}

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs

@@ -38,9 +38,6 @@ namespace eShopOnContainers.Droid.Activities
             CachedImageRenderer.Init();
             LoadApplication(new App());
 
-            var x = typeof(Xamarin.Forms.Themes.LightThemeResources);
-            x = typeof(Xamarin.Forms.Themes.Android.UnderlineEffect);
-
             Window window = this.Window;
             window.ClearFlags(WindowManagerFlags.TranslucentStatus);
             window.AddFlags(WindowManagerFlags.DrawsSystemBarBackgrounds);

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/BaseContainerEffect.cs

@@ -0,0 +1,66 @@
+using Xamarin.Forms.Platform.Android;
+
+namespace eShopOnContainers.Droid.Effects
+{
+    public abstract class BaseContainerEffect : PlatformEffect
+    {
+        private bool _unloaded;
+        private bool _attached;
+
+        protected bool Attached
+        {
+            get { return _attached; }
+        }
+
+        protected virtual bool CanBeApplied()
+        {
+            return true;
+        }
+
+        protected virtual void OnAttachedInternal()
+        {
+        }
+
+        protected virtual void OnDetachedInternal()
+        {
+        }
+
+        protected sealed override void OnAttached()
+        {
+            if (CanBeApplied())
+            {
+                _attached = true;
+
+                Container.ViewDetachedFromWindow -= ContainerViewDetachedFromWindow;
+                Container.ViewDetachedFromWindow += ContainerViewDetachedFromWindow;
+                Container.ViewAttachedToWindow -= ContainerViewAttachedToWindow;
+                Container.ViewAttachedToWindow += ContainerViewAttachedToWindow;
+
+                OnAttachedInternal();
+            }
+        }
+
+        protected sealed override void OnDetached()
+        {
+            if (_attached && !_unloaded)
+            {
+                _attached = false;
+
+                Container.ViewDetachedFromWindow -= ContainerViewDetachedFromWindow;
+                Container.ViewAttachedToWindow -= ContainerViewAttachedToWindow;
+
+                OnDetachedInternal();
+            }
+        }
+
+        private void ContainerViewDetachedFromWindow(object sender, global::Android.Views.View.ViewDetachedFromWindowEventArgs e)
+        {
+            _unloaded = true;
+        }
+
+        private void ContainerViewAttachedToWindow(object sender, global::Android.Views.View.ViewAttachedToWindowEventArgs e)
+        {
+            _unloaded = false;
+        }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs

@@ -0,0 +1,54 @@
+using System;
+using Xamarin.Forms;
+using eShopOnContainers.Droid.Effects;
+using Android.Views;
+using Android.Graphics;
+
+[assembly: ExportEffect(typeof(CircleEffect), "CircleEffect")]
+namespace eShopOnContainers.Droid.Effects
+{
+    public class CircleEffect : BaseContainerEffect
+    {
+        private ViewOutlineProvider _originalProvider;
+
+        protected override bool CanBeApplied()
+        {
+            return Container != null && (int)global::Android.OS.Build.VERSION.SdkInt >= 21;
+        }
+
+        protected override void OnAttachedInternal()
+        {
+            _originalProvider = Container.OutlineProvider;
+            Container.OutlineProvider = new CircleOutlineProvider();
+            Container.ClipToOutline = true;
+        }
+
+        protected override void OnDetachedInternal()
+        {
+            Container.ClipToOutline = false;
+            Container.OutlineProvider = _originalProvider;
+        }
+
+        private class CircleOutlineProvider : ViewOutlineProvider
+        {
+            public override void GetOutline(Android.Views.View view, Outline outline)
+            {
+                double width = view.Width;
+                double height = view.Height;
+
+                if (width <= 0 || height <= 0)
+                {
+                    return;
+                }
+
+                double min = Math.Min(width, height);
+                var radius = (float)(min / 2.0);
+
+                var layerX = width > min ? (width - min) / 2 : 0;
+                var layerY = height > min ? (height - min) / 2 : 0;
+
+                outline.SetRoundRect(new Rect((int)layerX, (int)layerY, (int)(layerX + min), (int)(layerY + min)), radius);
+            }
+        }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/EntryLineColorEffect.cs

@@ -7,6 +7,7 @@ using eShopOnContainers.Core.Behaviors;
 using System.ComponentModel;
 using System.Diagnostics;
 
+[assembly: ResolutionGroupName("eShopOnContainers")]
 [assembly: ExportEffect(typeof(EntryLineColorEffect), "EntryLineColorEffect")]
 namespace eShopOnContainers.Droid.Effects
 {

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs

@@ -1,15 +1,15 @@
 #pragma warning disable 1591
 // ------------------------------------------------------------------------------
-// <auto-generated>
+//  <autogenerated>
 //      This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//      Mono Runtime Version: 4.0.30319.42000
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if 
 //      the code is regenerated.
-// </auto-generated>
+//  </autogenerated>
 // ------------------------------------------------------------------------------
 
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.Droid.Resource", IsApplication=true)]
+[assembly: Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.Droid.Resource", IsApplication=true)]
 
 namespace eShopOnContainers.Droid
 {
@@ -64,6 +64,8 @@ namespace eShopOnContainers.Droid
 			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;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.actionBarSize = global::eShopOnContainers.Droid.Resource.Attribute.actionBarSize;
 		}
@@ -3126,11 +3128,11 @@ namespace eShopOnContainers.Droid
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f080027
+			// aapt resource value: 0x7f080028
-			public const int ApplicationName = 2131230759;
+			public const int ApplicationName = 2131230760;
 			
-			// aapt resource value: 0x7f080026
+			// aapt resource value: 0x7f080027
-			public const int Hello = 2131230758;
+			public const int Hello = 2131230759;
 			
 			// aapt resource value: 0x7f08000f
 			public const int abc_action_bar_home_description = 2131230735;
@@ -3198,8 +3200,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0x7f080025
 			public const int character_counter_pattern = 2131230757;
 			
-			// aapt resource value: 0x7f080028
+			// aapt resource value: 0x7f080026
-			public const int library_name = 2131230760;
+			public const int library_name = 2131230758;
 			
 			// aapt resource value: 0x7f080000
 			public const int mr_button_content_description = 2131230720;
@@ -4397,7 +4399,8 @@ namespace eShopOnContainers.Droid
 		public partial class Styleable
 		{
 			
-			public static int[] ActionBar = new int[] {
+			public static int[] ActionBar = new int[]
+			{
 					2130772007,
 					2130772009,
 					2130772010,
@@ -4507,13 +4510,15 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 5
 			public const int ActionBar_titleTextStyle = 5;
 			
-			public static int[] ActionBarLayout = new int[] {
+			public static int[] ActionBarLayout = new int[]
+			{
 					16842931};
 			
 			// aapt resource value: 0
 			public const int ActionBarLayout_android_layout_gravity = 0;
 			
-			public static int[] ActionMenuItemView = new int[] {
+			public static int[] ActionMenuItemView = new int[]
+			{
 					16843071};
 			
 			// aapt resource value: 0
@@ -4521,7 +4526,8 @@ namespace eShopOnContainers.Droid
 			
 			public static int[] ActionMenuView;
 			
-			public static int[] ActionMode = new int[] {
+			public static int[] ActionMode = new int[]
+			{
 					2130772007,
 					2130772013,
 					2130772014,
@@ -4547,7 +4553,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int ActionMode_titleTextStyle = 1;
 			
-			public static int[] ActivityChooserView = new int[] {
+			public static int[] ActivityChooserView = new int[]
+			{
 					2130772035,
 					2130772036};
 			
@@ -4557,7 +4564,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0
 			public const int ActivityChooserView_initialActivityCount = 0;
 			
-			public static int[] AlertDialog = new int[] {
+			public static int[] AlertDialog = new int[]
+			{
 					16842994,
 					2130772037,
 					2130772038,
@@ -4583,7 +4591,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int AlertDialog_singleChoiceItemLayout = 4;
 			
-			public static int[] AppBarLayout = new int[] {
+			public static int[] AppBarLayout = new int[]
+			{
 					16842964,
 					2130772032,
 					2130772215};
@@ -4597,7 +4606,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int AppBarLayout_expanded = 2;
 			
-			public static int[] AppBarLayout_LayoutParams = new int[] {
+			public static int[] AppBarLayout_LayoutParams = new int[]
+			{
 					2130772216,
 					2130772217};
 			
@@ -4607,7 +4617,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1;
 			
-			public static int[] AppCompatImageView = new int[] {
+			public static int[] AppCompatImageView = new int[]
+			{
 					16843033,
 					2130772042};
 			
@@ -4617,7 +4628,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int AppCompatImageView_srcCompat = 1;
 			
-			public static int[] AppCompatTextView = new int[] {
+			public static int[] AppCompatTextView = new int[]
+			{
 					16842804,
 					2130772043};
 			
@@ -4627,7 +4639,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int AppCompatTextView_textAllCaps = 1;
 			
-			public static int[] AppCompatTheme = new int[] {
+			public static int[] AppCompatTheme = new int[]
+			{
 					16842839,
 					16842926,
 					2130772044,
@@ -5077,7 +5090,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 3
 			public const int AppCompatTheme_windowNoTitle = 3;
 			
-			public static int[] BottomSheetBehavior_Params = new int[] {
+			public static int[] BottomSheetBehavior_Params = new int[]
+			{
 					2130772218,
 					2130772219};
 			
@@ -5087,13 +5101,15 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 0
 			public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
 			
-			public static int[] ButtonBarLayout = new int[] {
+			public static int[] ButtonBarLayout = new int[]
+			{
 					2130772154};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
 			
-			public static int[] CardView = new int[] {
+			public static int[] CardView = new int[]
+			{
 					16843071,
 					16843072,
 					2130771995,
@@ -5147,7 +5163,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 11
 			public const int CardView_contentPaddingTop = 11;
 			
-			public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
+			public static int[] CollapsingAppBarLayout_LayoutParams = new int[]
+			{
 					2130772220,
 					2130772221};
 			
@@ -5157,7 +5174,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
 			
-			public static int[] CollapsingToolbarLayout = new int[] {
+			public static int[] CollapsingToolbarLayout = new int[]
+			{
 					2130772009,
 					2130772222,
 					2130772223,
@@ -5215,7 +5233,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 10
 			public const int CollapsingToolbarLayout_toolbarId = 10;
 			
-			public static int[] CompoundButton = new int[] {
+			public static int[] CompoundButton = new int[]
+			{
 					16843015,
 					2130772155,
 					2130772156};
@@ -5229,7 +5248,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			public static int[] CoordinatorLayout = new int[] {
+			public static int[] CoordinatorLayout = new int[]
+			{
 					2130772235,
 					2130772236};
 			
@@ -5239,7 +5259,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int CoordinatorLayout_statusBarBackground = 1;
 			
-			public static int[] CoordinatorLayout_LayoutParams = new int[] {
+			public static int[] CoordinatorLayout_LayoutParams = new int[]
+			{
 					16842931,
 					2130772237,
 					2130772238,
@@ -5261,7 +5282,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 3
 			public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
 			
-			public static int[] DesignTheme = new int[] {
+			public static int[] DesignTheme = new int[]
+			{
 					2130772241,
 					2130772242,
 					2130772243};
@@ -5275,7 +5297,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			public static int[] DrawerArrowToggle = new int[] {
+			public static int[] DrawerArrowToggle = new int[]
+			{
 					2130772157,
 					2130772158,
 					2130772159,
@@ -5309,7 +5332,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			public static int[] FloatingActionButton = new int[] {
+			public static int[] FloatingActionButton = new int[]
+			{
 					2130772032,
 					2130772213,
 					2130772214,
@@ -5343,7 +5367,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			public static int[] ForegroundLinearLayout = new int[] {
+			public static int[] ForegroundLinearLayout = new int[]
+			{
 					16843017,
 					16843264,
 					2130772249};
@@ -5357,7 +5382,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			public static int[] LinearLayoutCompat = new int[] {
+			public static int[] LinearLayoutCompat = new int[]
+			{
 					16842927,
 					16842948,
 					16843046,
@@ -5395,7 +5421,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int LinearLayoutCompat_showDividers = 7;
 			
-			public static int[] LinearLayoutCompat_Layout = new int[] {
+			public static int[] LinearLayoutCompat_Layout = new int[]
+			{
 					16842931,
 					16842996,
 					16842997,
@@ -5413,7 +5440,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
 			
-			public static int[] ListPopupWindow = new int[] {
+			public static int[] ListPopupWindow = new int[]
+			{
 					16843436,
 					16843437};
 			
@@ -5423,7 +5451,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			public static int[] MediaRouteButton = new int[] {
+			public static int[] MediaRouteButton = new int[]
+			{
 					16843071,
 					16843072,
 					2130771994};
@@ -5437,7 +5466,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
 			
-			public static int[] MenuGroup = new int[] {
+			public static int[] MenuGroup = new int[]
+			{
 					16842766,
 					16842960,
 					16843156,
@@ -5463,7 +5493,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int MenuGroup_android_visible = 2;
 			
-			public static int[] MenuItem = new int[] {
+			public static int[] MenuItem = new int[]
+			{
 					16842754,
 					16842766,
 					16842960,
@@ -5533,7 +5564,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 13
 			public const int MenuItem_showAsAction = 13;
 			
-			public static int[] MenuView = new int[] {
+			public static int[] MenuView = new int[]
+			{
 					16842926,
 					16843052,
 					16843053,
@@ -5567,7 +5599,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 7
 			public const int MenuView_preserveIconSpacing = 7;
 			
-			public static int[] NavigationView = new int[] {
+			public static int[] NavigationView = new int[]
+			{
 					16842964,
 					16842973,
 					16843039,
@@ -5609,7 +5642,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int NavigationView_menu = 4;
 			
-			public static int[] PopupWindow = new int[] {
+			public static int[] PopupWindow = new int[]
+			{
 					16843126,
 					2130772173};
 			
@@ -5619,13 +5653,15 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 1
 			public const int PopupWindow_overlapAnchor = 1;
 			
-			public static int[] PopupWindowBackgroundState = new int[] {
+			public static int[] PopupWindowBackgroundState = new int[]
+			{
 					2130772174};
 			
 			// aapt resource value: 0
 			public const int PopupWindowBackgroundState_state_above_anchor = 0;
 			
-			public static int[] ProgressWheel = new int[] {
+			public static int[] ProgressWheel = new int[]
+			{
 					2130772284,
 					2130772285,
 					2130772286,
@@ -5675,7 +5711,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int ProgressWheel_ahTextSize = 2;
 			
-			public static int[] RecyclerView = new int[] {
+			public static int[] RecyclerView = new int[]
+			{
 					16842948,
 					2130771968,
 					2130771969,
@@ -5697,19 +5734,22 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int RecyclerView_stackFromEnd = 4;
 			
-			public static int[] ScrimInsetsFrameLayout = new int[] {
+			public static int[] ScrimInsetsFrameLayout = new int[]
+			{
 					2130772256};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
-			public static int[] ScrollingViewBehavior_Params = new int[] {
+			public static int[] ScrollingViewBehavior_Params = new int[]
+			{
 					2130772257};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
 			
-			public static int[] SearchView = new int[] {
+			public static int[] SearchView = new int[]
+			{
 					16842970,
 					16843039,
 					16843296,
@@ -5779,7 +5819,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 12
 			public const int SearchView_voiceIcon = 12;
 			
-			public static int[] SnackbarLayout = new int[] {
+			public static int[] SnackbarLayout = new int[]
+			{
 					16843039,
 					2130772032,
 					2130772258};
@@ -5793,7 +5834,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			public static int[] Spinner = new int[] {
+			public static int[] Spinner = new int[]
+			{
 					16842930,
 					16843126,
 					16843131,
@@ -5815,7 +5857,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			public static int[] SwitchCompat = new int[] {
+			public static int[] SwitchCompat = new int[]
+			{
 					16843044,
 					16843045,
 					16843074,
@@ -5857,7 +5900,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 3
 			public const int SwitchCompat_track = 3;
 			
-			public static int[] TabItem = new int[] {
+			public static int[] TabItem = new int[]
+			{
 					16842754,
 					16842994,
 					16843087};
@@ -5871,7 +5915,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			public static int[] TabLayout = new int[] {
+			public static int[] TabLayout = new int[]
+			{
 					2130772259,
 					2130772260,
 					2130772261,
@@ -5937,7 +5982,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 9
 			public const int TabLayout_tabTextColor = 9;
 			
-			public static int[] TextAppearance = new int[] {
+			public static int[] TextAppearance = new int[]
+			{
 					16842901,
 					16842902,
 					16842903,
@@ -5975,7 +6021,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 8
 			public const int TextAppearance_textAllCaps = 8;
 			
-			public static int[] TextInputLayout = new int[] {
+			public static int[] TextInputLayout = new int[]
+			{
 					16842906,
 					16843088,
 					2130772275,
@@ -6021,7 +6068,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int TextInputLayout_hintTextAppearance = 2;
 			
-			public static int[] Toolbar = new int[] {
+			public static int[] Toolbar = new int[]
+			{
 					16842927,
 					16843072,
 					2130772009,
@@ -6123,7 +6171,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 23
 			public const int Toolbar_titleTextColor = 23;
 			
-			public static int[] View = new int[] {
+			public static int[] View = new int[]
+			{
 					16842752,
 					16842970,
 					2130772210,
@@ -6145,7 +6194,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 4
 			public const int View_theme = 4;
 			
-			public static int[] ViewBackgroundHelper = new int[] {
+			public static int[] ViewBackgroundHelper = new int[]
+			{
 					16842964,
 					2130772213,
 					2130772214};
@@ -6159,7 +6209,8 @@ namespace eShopOnContainers.Droid
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
 			
-			public static int[] ViewStubCompat = new int[] {
+			public static int[] ViewStubCompat = new int[]
+			{
 					16842960,
 					16842994,
 					16842995};

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

@@ -54,167 +54,9 @@
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Acr.Support.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="AndHUD, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="OkHttp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Plugin.CurrentActivity, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator.Abstractions, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Permissions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Permissions.Abstractions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SlideOverKit.Droid, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ObjectModel" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Android">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Android.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Base">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Base.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Light">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Light.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FormsViewGroup">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Pages">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Pages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="Autofac">
-      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\MainActivity.cs" />
@@ -229,6 +71,8 @@
     <Compile Include="Renderers\SlideDownMenuPageRenderer.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Effects\CircleEffect.cs" />
+    <Compile Include="Effects\BaseContainerEffect.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">
@@ -241,7 +85,6 @@
       <Link>Assets\SourceSansPro-Regular.ttf</Link>
     </AndroidAsset>
     <None Include="app.config" />
-    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
     <AndroidResource Include="Resources\drawable-xxhdpi\switch_off.png" />
@@ -388,15 +231,34 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\default_campaign.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Acr.Support" version="2.1.0" />
+    <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
+    <PackageReference Include="AndHUD" version="1.2.0" />
+    <PackageReference Include="Autofac" version="4.5.0" />
+    <PackageReference Include="IdentityModel" version="2.10.0" />
+    <PackageReference Include="modernhttpclient" version="2.4.2" />
+    <PackageReference Include="NETStandard.Library" version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
+    <PackageReference Include="PCLCrypto" version="2.0.147" />
+    <PackageReference Include="Plugin.CurrentActivity" version="1.0.1" />
+    <PackageReference Include="Plugin.Permissions" version="1.1.7" />
+    <PackageReference Include="SlideOverKit" version="2.1.4" />
+    <PackageReference Include="Splat" version="1.6.2" />
+    <PackageReference Include="Validation" version="2.2.8" />
+    <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
+    <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
+    <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.Design" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v4" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.CardView" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" />
+    <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
+    <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
+    <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>

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

@@ -14,6 +14,11 @@
   <package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid70" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid60" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
+  <package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid60" />
+  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid60" />
+  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="monoandroid60" />
+  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="monoandroid60" />
+  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="monoandroid60" />
   <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid60" />
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid60" />
   <package id="SlideOverKit" version="2.1.4" targetFramework="monoandroid70" />
@@ -63,6 +68,7 @@
   <package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid60" />
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid70" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid70" />
+  <package id="Validation" version="2.2.8" targetFramework="monoandroid60" />
   <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid60" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
@@ -76,7 +82,4 @@
   <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="monoandroid70" />
 </packages>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs

@@ -1,15 +1,15 @@
 #pragma warning disable 1591
 // ------------------------------------------------------------------------------
-// <auto-generated>
+//  <autogenerated>
 //      This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//      Mono Runtime Version: 4.0.30319.42000
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if 
 //      the code is regenerated.
-// </auto-generated>
+//  </autogenerated>
 // ------------------------------------------------------------------------------
 
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.TestRunner.Droid.Resource", IsApplication=true)]
+[assembly: Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.TestRunner.Droid.Resource", IsApplication=true)]
 
 namespace eShopOnContainers.TestRunner.Droid
 {
@@ -64,6 +64,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			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;
 			global::Xamarin.Forms.Platform.Android.Resource.Attribute.actionBarSize = global::eShopOnContainers.TestRunner.Droid.Resource.Attribute.actionBarSize;
 		}
@@ -3036,11 +3038,11 @@ namespace eShopOnContainers.TestRunner.Droid
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f080027
+			// aapt resource value: 0x7f080028
-			public const int ApplicationName = 2131230759;
+			public const int ApplicationName = 2131230760;
 			
-			// aapt resource value: 0x7f080026
+			// aapt resource value: 0x7f080027
-			public const int Hello = 2131230758;
+			public const int Hello = 2131230759;
 			
 			// aapt resource value: 0x7f08000f
 			public const int abc_action_bar_home_description = 2131230735;
@@ -3108,8 +3110,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 0x7f080025
 			public const int character_counter_pattern = 2131230757;
 			
-			// aapt resource value: 0x7f080028
+			// aapt resource value: 0x7f080026
-			public const int library_name = 2131230760;
+			public const int library_name = 2131230758;
 			
 			// aapt resource value: 0x7f080000
 			public const int mr_button_content_description = 2131230720;
@@ -4295,7 +4297,8 @@ namespace eShopOnContainers.TestRunner.Droid
 		public partial class Styleable
 		{
 			
-			public static int[] ActionBar = new int[] {
+			public static int[] ActionBar = new int[]
+			{
 					2130772007,
 					2130772009,
 					2130772010,
@@ -4405,13 +4408,15 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 5
 			public const int ActionBar_titleTextStyle = 5;
 			
-			public static int[] ActionBarLayout = new int[] {
+			public static int[] ActionBarLayout = new int[]
+			{
 					16842931};
 			
 			// aapt resource value: 0
 			public const int ActionBarLayout_android_layout_gravity = 0;
 			
-			public static int[] ActionMenuItemView = new int[] {
+			public static int[] ActionMenuItemView = new int[]
+			{
 					16843071};
 			
 			// aapt resource value: 0
@@ -4419,7 +4424,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			
 			public static int[] ActionMenuView;
 			
-			public static int[] ActionMode = new int[] {
+			public static int[] ActionMode = new int[]
+			{
 					2130772007,
 					2130772013,
 					2130772014,
@@ -4445,7 +4451,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int ActionMode_titleTextStyle = 1;
 			
-			public static int[] ActivityChooserView = new int[] {
+			public static int[] ActivityChooserView = new int[]
+			{
 					2130772035,
 					2130772036};
 			
@@ -4455,7 +4462,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 0
 			public const int ActivityChooserView_initialActivityCount = 0;
 			
-			public static int[] AlertDialog = new int[] {
+			public static int[] AlertDialog = new int[]
+			{
 					16842994,
 					2130772037,
 					2130772038,
@@ -4481,7 +4489,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int AlertDialog_singleChoiceItemLayout = 4;
 			
-			public static int[] AppBarLayout = new int[] {
+			public static int[] AppBarLayout = new int[]
+			{
 					16842964,
 					2130772032,
 					2130772215};
@@ -4495,7 +4504,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int AppBarLayout_expanded = 2;
 			
-			public static int[] AppBarLayout_LayoutParams = new int[] {
+			public static int[] AppBarLayout_LayoutParams = new int[]
+			{
 					2130772216,
 					2130772217};
 			
@@ -4505,7 +4515,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1;
 			
-			public static int[] AppCompatImageView = new int[] {
+			public static int[] AppCompatImageView = new int[]
+			{
 					16843033,
 					2130772042};
 			
@@ -4515,7 +4526,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int AppCompatImageView_srcCompat = 1;
 			
-			public static int[] AppCompatTextView = new int[] {
+			public static int[] AppCompatTextView = new int[]
+			{
 					16842804,
 					2130772043};
 			
@@ -4525,7 +4537,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int AppCompatTextView_textAllCaps = 1;
 			
-			public static int[] AppCompatTheme = new int[] {
+			public static int[] AppCompatTheme = new int[]
+			{
 					16842839,
 					16842926,
 					2130772044,
@@ -4975,7 +4988,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 3
 			public const int AppCompatTheme_windowNoTitle = 3;
 			
-			public static int[] BottomSheetBehavior_Params = new int[] {
+			public static int[] BottomSheetBehavior_Params = new int[]
+			{
 					2130772218,
 					2130772219};
 			
@@ -4985,13 +4999,15 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 0
 			public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
 			
-			public static int[] ButtonBarLayout = new int[] {
+			public static int[] ButtonBarLayout = new int[]
+			{
 					2130772154};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
 			
-			public static int[] CardView = new int[] {
+			public static int[] CardView = new int[]
+			{
 					16843071,
 					16843072,
 					2130771995,
@@ -5045,7 +5061,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 11
 			public const int CardView_contentPaddingTop = 11;
 			
-			public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
+			public static int[] CollapsingAppBarLayout_LayoutParams = new int[]
+			{
 					2130772220,
 					2130772221};
 			
@@ -5055,7 +5072,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
 			
-			public static int[] CollapsingToolbarLayout = new int[] {
+			public static int[] CollapsingToolbarLayout = new int[]
+			{
 					2130772009,
 					2130772222,
 					2130772223,
@@ -5113,7 +5131,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 10
 			public const int CollapsingToolbarLayout_toolbarId = 10;
 			
-			public static int[] CompoundButton = new int[] {
+			public static int[] CompoundButton = new int[]
+			{
 					16843015,
 					2130772155,
 					2130772156};
@@ -5127,7 +5146,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			public static int[] CoordinatorLayout = new int[] {
+			public static int[] CoordinatorLayout = new int[]
+			{
 					2130772235,
 					2130772236};
 			
@@ -5137,7 +5157,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int CoordinatorLayout_statusBarBackground = 1;
 			
-			public static int[] CoordinatorLayout_LayoutParams = new int[] {
+			public static int[] CoordinatorLayout_LayoutParams = new int[]
+			{
 					16842931,
 					2130772237,
 					2130772238,
@@ -5159,7 +5180,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 3
 			public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
 			
-			public static int[] DesignTheme = new int[] {
+			public static int[] DesignTheme = new int[]
+			{
 					2130772241,
 					2130772242,
 					2130772243};
@@ -5173,7 +5195,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			public static int[] DrawerArrowToggle = new int[] {
+			public static int[] DrawerArrowToggle = new int[]
+			{
 					2130772157,
 					2130772158,
 					2130772159,
@@ -5207,7 +5230,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			public static int[] FloatingActionButton = new int[] {
+			public static int[] FloatingActionButton = new int[]
+			{
 					2130772032,
 					2130772213,
 					2130772214,
@@ -5241,7 +5265,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			public static int[] ForegroundLinearLayout = new int[] {
+			public static int[] ForegroundLinearLayout = new int[]
+			{
 					16843017,
 					16843264,
 					2130772249};
@@ -5255,7 +5280,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			public static int[] LinearLayoutCompat = new int[] {
+			public static int[] LinearLayoutCompat = new int[]
+			{
 					16842927,
 					16842948,
 					16843046,
@@ -5293,7 +5319,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int LinearLayoutCompat_showDividers = 7;
 			
-			public static int[] LinearLayoutCompat_Layout = new int[] {
+			public static int[] LinearLayoutCompat_Layout = new int[]
+			{
 					16842931,
 					16842996,
 					16842997,
@@ -5311,7 +5338,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
 			
-			public static int[] ListPopupWindow = new int[] {
+			public static int[] ListPopupWindow = new int[]
+			{
 					16843436,
 					16843437};
 			
@@ -5321,7 +5349,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			public static int[] MediaRouteButton = new int[] {
+			public static int[] MediaRouteButton = new int[]
+			{
 					16843071,
 					16843072,
 					2130771994};
@@ -5335,7 +5364,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
 			
-			public static int[] MenuGroup = new int[] {
+			public static int[] MenuGroup = new int[]
+			{
 					16842766,
 					16842960,
 					16843156,
@@ -5361,7 +5391,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int MenuGroup_android_visible = 2;
 			
-			public static int[] MenuItem = new int[] {
+			public static int[] MenuItem = new int[]
+			{
 					16842754,
 					16842766,
 					16842960,
@@ -5431,7 +5462,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 13
 			public const int MenuItem_showAsAction = 13;
 			
-			public static int[] MenuView = new int[] {
+			public static int[] MenuView = new int[]
+			{
 					16842926,
 					16843052,
 					16843053,
@@ -5465,7 +5497,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 7
 			public const int MenuView_preserveIconSpacing = 7;
 			
-			public static int[] NavigationView = new int[] {
+			public static int[] NavigationView = new int[]
+			{
 					16842964,
 					16842973,
 					16843039,
@@ -5507,7 +5540,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int NavigationView_menu = 4;
 			
-			public static int[] PopupWindow = new int[] {
+			public static int[] PopupWindow = new int[]
+			{
 					16843126,
 					2130772173};
 			
@@ -5517,13 +5551,15 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 1
 			public const int PopupWindow_overlapAnchor = 1;
 			
-			public static int[] PopupWindowBackgroundState = new int[] {
+			public static int[] PopupWindowBackgroundState = new int[]
+			{
 					2130772174};
 			
 			// aapt resource value: 0
 			public const int PopupWindowBackgroundState_state_above_anchor = 0;
 			
-			public static int[] ProgressWheel = new int[] {
+			public static int[] ProgressWheel = new int[]
+			{
 					2130772284,
 					2130772285,
 					2130772286,
@@ -5573,7 +5609,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int ProgressWheel_ahTextSize = 2;
 			
-			public static int[] RecyclerView = new int[] {
+			public static int[] RecyclerView = new int[]
+			{
 					16842948,
 					2130771968,
 					2130771969,
@@ -5595,19 +5632,22 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int RecyclerView_stackFromEnd = 4;
 			
-			public static int[] ScrimInsetsFrameLayout = new int[] {
+			public static int[] ScrimInsetsFrameLayout = new int[]
+			{
 					2130772256};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
-			public static int[] ScrollingViewBehavior_Params = new int[] {
+			public static int[] ScrollingViewBehavior_Params = new int[]
+			{
 					2130772257};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
 			
-			public static int[] SearchView = new int[] {
+			public static int[] SearchView = new int[]
+			{
 					16842970,
 					16843039,
 					16843296,
@@ -5677,7 +5717,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 12
 			public const int SearchView_voiceIcon = 12;
 			
-			public static int[] SnackbarLayout = new int[] {
+			public static int[] SnackbarLayout = new int[]
+			{
 					16843039,
 					2130772032,
 					2130772258};
@@ -5691,7 +5732,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			public static int[] Spinner = new int[] {
+			public static int[] Spinner = new int[]
+			{
 					16842930,
 					16843126,
 					16843131,
@@ -5713,7 +5755,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			public static int[] SwitchCompat = new int[] {
+			public static int[] SwitchCompat = new int[]
+			{
 					16843044,
 					16843045,
 					16843074,
@@ -5755,7 +5798,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 3
 			public const int SwitchCompat_track = 3;
 			
-			public static int[] TabItem = new int[] {
+			public static int[] TabItem = new int[]
+			{
 					16842754,
 					16842994,
 					16843087};
@@ -5769,7 +5813,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			public static int[] TabLayout = new int[] {
+			public static int[] TabLayout = new int[]
+			{
 					2130772259,
 					2130772260,
 					2130772261,
@@ -5835,7 +5880,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 9
 			public const int TabLayout_tabTextColor = 9;
 			
-			public static int[] TextAppearance = new int[] {
+			public static int[] TextAppearance = new int[]
+			{
 					16842901,
 					16842902,
 					16842903,
@@ -5873,7 +5919,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 8
 			public const int TextAppearance_textAllCaps = 8;
 			
-			public static int[] TextInputLayout = new int[] {
+			public static int[] TextInputLayout = new int[]
+			{
 					16842906,
 					16843088,
 					2130772275,
@@ -5919,7 +5966,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int TextInputLayout_hintTextAppearance = 2;
 			
-			public static int[] Toolbar = new int[] {
+			public static int[] Toolbar = new int[]
+			{
 					16842927,
 					16843072,
 					2130772009,
@@ -6021,7 +6069,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 23
 			public const int Toolbar_titleTextColor = 23;
 			
-			public static int[] View = new int[] {
+			public static int[] View = new int[]
+			{
 					16842752,
 					16842970,
 					2130772210,
@@ -6043,7 +6092,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 4
 			public const int View_theme = 4;
 			
-			public static int[] ViewBackgroundHelper = new int[] {
+			public static int[] ViewBackgroundHelper = new int[]
+			{
 					16842964,
 					2130772213,
 					2130772214};
@@ -6057,7 +6107,8 @@ namespace eShopOnContainers.TestRunner.Droid
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
 			
-			public static int[] ViewStubCompat = new int[] {
+			public static int[] ViewStubCompat = new int[]
+			{
 					16842960,
 					16842994,
 					16842995};

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

@@ -45,168 +45,6 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Android" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Plugin.CurrentActivity, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator.Abstractions, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Permissions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Permissions.Abstractions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Pages.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.dotnet">
-      <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\monoandroid\xunit.execution.dotnet.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.runner.utility.dotnet">
-      <HintPath>..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.runner.devices">
-      <HintPath>..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="Autofac">
-      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Settings.Abstractions">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Settings">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="SlideOverKit">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
-    </Reference>
-    <Reference Include="SlideOverKit.Droid">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll</HintPath>
-    </Reference>
-    <Reference Include="Acr.Support.Android">
-      <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="AndHUD">
-      <HintPath>..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll</HintPath>
-    </Reference>
-    <Reference Include="Splat">
-      <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll</HintPath>
-    </Reference>
-    <Reference Include="Acr.UserDialogs">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath>
-    </Reference>
-    <Reference Include="Acr.UserDialogs.Interface">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
-    </Reference>
-    <Reference Include="IdentityModel.Portable">
-      <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Platform">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms.Droid">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
-    </Reference>
-    <Reference Include="ModernHttpClient">
-      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
-    </Reference>
-    <Reference Include="OkHttp">
-      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Android">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Android.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Base">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Light">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Light.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
     <Compile Include="MainApplication.cs" />
@@ -215,9 +53,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
@@ -235,6 +70,43 @@
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Acr.Support" version="2.1.0" />
+    <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
+    <PackageReference Include="AndHUD" version="1.2.0" />
+    <PackageReference Include="Autofac" version="4.5.0" />
+    <PackageReference Include="IdentityModel" version="2.10.0" />
+    <PackageReference Include="modernhttpclient" version="2.4.2" />
+    <PackageReference Include="NETStandard.Library" version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
+    <PackageReference Include="PCLCrypto" version="2.0.147" />
+    <PackageReference Include="Plugin.CurrentActivity" version="1.0.1" />
+    <PackageReference Include="Plugin.Permissions" version="1.1.7" />
+    <PackageReference Include="SlideOverKit" version="2.1.4" />
+    <PackageReference Include="Splat" version="1.6.2" />
+    <PackageReference Include="Validation" version="2.2.8" />
+    <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
+    <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
+    <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.Design" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v4" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.CardView" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" />
+    <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" />
+    <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
+    <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
+    <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
+    <PackageReference Include="xunit.runner.devices">
+      <Version>2.2.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj">
       <Project>{f7b6a162-bc4d-4924-b16a-713f9b0344e7}</Project>
@@ -242,22 +114,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-     Other similar extension points exist, see Microsoft.Common.targets.
-		<Target Name="BeforeBuild">
-		</Target>
-		<Target Name="AfterBuild">
-		</Target>
- -->
-  <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
 </Project>

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

@@ -13,6 +13,11 @@
   <package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid60" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid60" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
+  <package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid60" />
+  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid60" />
+  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="monoandroid60" />
+  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="monoandroid60" />
+  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="monoandroid60" />
   <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid60" />
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid60" />
   <package id="SlideOverKit" version="2.1.4" targetFramework="monoandroid60" />
@@ -60,6 +65,7 @@
   <package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid60" />
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid60" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid60" />
+  <package id="Validation" version="2.2.8" targetFramework="monoandroid60" />
   <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid60" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
@@ -73,9 +79,6 @@
   <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid60" />
-  <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="monoandroid60" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="monoandroid60" />
   <package id="xunit.assert" version="2.2.0" targetFramework="monoandroid60" />
   <package id="xunit.core" version="2.1.0" targetFramework="monoandroid60" />

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj

@@ -11,13 +11,14 @@
     <AssemblyName>eShopOnContainers.TestRunner.Windows</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16267.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.16267.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <PackageCertificateKeyFile>eShopOnContainers.TestRunner.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -88,10 +89,6 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -130,6 +127,17 @@
       <Name>eShopOnContainers.UnitTests</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.0-preview1-25611-03</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms">
+      <Version>2.3.4.231</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.devices">
+      <Version>2.1.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

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

@@ -1,18 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
-    "Xamarin.Forms": "2.3.4.231",
-    "xunit.runner.devices": "2.1.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}

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

@@ -24,7 +24,8 @@
     <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
-    <MtouchSdkVersion></MtouchSdkVersion>
+    <MtouchSdkVersion>
+    </MtouchSdkVersion>
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchUseLlvm>False</MtouchUseLlvm>
@@ -58,7 +59,8 @@
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
-    <MtouchSdkVersion></MtouchSdkVersion>
+    <MtouchSdkVersion>
+    </MtouchSdkVersion>
     <MtouchLink>None</MtouchLink>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -104,124 +106,37 @@
     <None Include="Info.plist" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <InterfaceDefinition Include="Resources\LaunchScreen.xib" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.iOS" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.dotnet">
-      <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\xamarinios\xunit.execution.dotnet.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.runner.utility.dotnet">
-      <HintPath>..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.runner.devices">
-      <HintPath>..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="xunit.assert">
-      <HintPath>..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac">
-      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Settings.Abstractions">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Settings">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
-    </Reference>
-    <Reference Include="SlideOverKit">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
-    </Reference>
-    <Reference Include="SlideOverKit.iOS">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Acr.Support.iOS">
-      <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Splat">
-      <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll</HintPath>
-    </Reference>
-    <Reference Include="Acr.UserDialogs">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath>
-    </Reference>
-    <Reference Include="Acr.UserDialogs.Interface">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
-    </Reference>
-    <Reference Include="IdentityModel.Portable">
-      <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
-    </Reference>
-    <Reference Include="WebP.Touch">
-      <HintPath>..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Platform">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms.Touch">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
-    </Reference>
-    <Reference Include="ModernHttpClient">
-      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Base">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.iOS">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Light">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Light.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator.Abstractions">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Entitlements.plist" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.iOS" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Acr.Support" version="2.1.0" />
+    <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
+    <PackageReference Include="Autofac" version="4.5.0" />
+    <PackageReference Include="IdentityModel" version="2.10.0" />
+    <PackageReference Include="modernhttpclient" version="2.4.2" />
+    <PackageReference Include="NETStandard.Library" version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
+    <PackageReference Include="PCLCrypto" version="2.0.147" />
+    <PackageReference Include="SlideOverKit" version="2.1.4" />
+    <PackageReference Include="Splat" version="1.6.2" />
+    <PackageReference Include="Validation" version="2.2.8" />
+    <PackageReference Include="WebP.Touch" version="1.0.3" />
+    <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
+    <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
+    <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
+    <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
+    <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
+    <PackageReference Include="xunit.runner.devices">
+      <Version>2.2.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj">
       <Project>{f7b6a162-bc4d-4924-b16a-713f9b0344e7}</Project>
@@ -229,13 +144,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
-  <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
 </Project>

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

@@ -12,6 +12,11 @@
   <package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
+  <package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
+  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="xamarinios10" />
   <package id="SlideOverKit" version="2.1.4" targetFramework="xamarinios10" />
   <package id="Splat" version="1.6.2" targetFramework="xamarinios10" />
   <package id="System.AppContext" version="4.1.0" targetFramework="xamarinios10" />
@@ -57,15 +62,13 @@
   <package id="System.Threading.Timer" version="4.0.1" targetFramework="xamarinios10" />
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="xamarinios10" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
   <package id="WebP.Touch" version="1.0.3" targetFramework="xamarinios10" />
   <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="xamarinios10" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="xamarinios10" />
   <package id="xunit.assert" version="2.2.0" targetFramework="xamarinios10" />
   <package id="xunit.core" version="2.1.0" targetFramework="xamarinios10" />

src/Mobile/eShopOnContainers/eShopOnContainers.UITests/eShopOnContainers.UITests.csproj

@@ -28,32 +28,15 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="Xamarin.UITest, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.UITest.2.0.3\lib\Xamarin.UITest.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NUnit" version="2.6.4" targetFramework="net45" />
+    <PackageReference Include="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
+    <PackageReference Include="Xamarin.UITest" version="2.0.3" targetFramework="net45" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Compile Include="Tests.cs" />
     <Compile Include="AppInitializer.cs" />

src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj

@@ -1,71 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <TargetFramework>netstandard2.0</TargetFramework>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <PackageTargetFallback>portable-net45+win8+wpa81+wp8</PackageTargetFallback>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F7B6A162-BC4D-4924-B16A-713F9B0344E7}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>eShopOnContainers.UnitTests</RootNamespace>
-    <AssemblyName>eShopOnContainers.UnitTests</AssemblyName>
-    <DefaultLanguage>es-ES</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="xunit" Version="2.2.0" />
-    <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
+    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
-    <Compile Include="Services\BasketServiceTests.cs" />
+    <PackageReference Include="Xamarin.Forms" Version="2.3.4.231" />
-    <Compile Include="Services\CatalogServiceTests.cs" />
-    <Compile Include="Services\MarketingServiceTests.cs" />
-    <Compile Include="ViewModels\CatalogViewModelTests.cs" />
-    <Compile Include="ViewModels\MainViewModelTests.cs" />
-    <Compile Include="ViewModels\MarketingViewModelTests.cs" />
-    <Compile Include="ViewModels\OrderViewModelTests.cs" />
-    <Compile Include="Services\OrdersServiceTests.cs" />
-    <Compile Include="Behaviors\EventToCommandBehaviorTests.cs" />
-    <Compile Include="Mocks\MockViewModel.cs" />
-    <Compile Include="ViewModels\MockViewModelTests.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
+    <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj" />
-    <None Include="project.json" />
   </ItemGroup>
-  <ItemGroup>
+  
-    <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
-      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
-      <Name>eShopOnContainers.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>

src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F7B6A162-BC4D-4924-B16A-713F9B0344E7}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>eShopOnContainers.UnitTests</RootNamespace>
+    <AssemblyName>eShopOnContainers.UnitTests</AssemblyName>
+    <DefaultLanguage>es-ES</DefaultLanguage>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
+    <Compile Include="Services\BasketServiceTests.cs" />
+    <Compile Include="Services\CatalogServiceTests.cs" />
+    <Compile Include="Services\MarketingServiceTests.cs" />
+    <Compile Include="ViewModels\CatalogViewModelTests.cs" />
+    <Compile Include="ViewModels\MainViewModelTests.cs" />
+    <Compile Include="ViewModels\MarketingViewModelTests.cs" />
+    <Compile Include="ViewModels\OrderViewModelTests.cs" />
+    <Compile Include="Services\OrdersServiceTests.cs" />
+    <Compile Include="Behaviors\EventToCommandBehaviorTests.cs" />
+    <Compile Include="Mocks\MockViewModel.cs" />
+    <Compile Include="ViewModels\MockViewModelTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
+      <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
+      <Name>eShopOnContainers.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+</Project>

src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj

@@ -11,14 +11,16 @@
     <AssemblyName>eShopOnContainers.Windows</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16267.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.16267.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
+    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
     <SkipValidatePackageReferences>true</SkipValidatePackageReferences>
+    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -100,7 +102,6 @@
     <Content Include="..\CommonResources\Fonts\SourceSansPro-Regular.ttf">
       <Link>Assets\Fonts\SourceSansPro-Regular.ttf</Link>
     </Content>
-    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -171,18 +172,52 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="WindowsMobile, Version=10.0.10586.0">
-      <Name>Windows Mobile Extensions for the UWP</Name>
-    </SDKReference>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
       <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
       <Name>eShopOnContainers.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Include="Acr.UserDialogs">
+      <Version>6.3.3</Version>
+    </PackageReference>
+    <PackageReference Include="IdentityModel">
+      <Version>2.10.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.0-preview1-25611-03</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>10.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="PCLCrypto">
+      <Version>2.0.147</Version>
+    </PackageReference>
+    <PackageReference Include="SlideOverKit">
+      <Version>2.1.4</Version>
+    </PackageReference>
+    <PackageReference Include="Xam.Plugin.Geolocator">
+      <Version>3.0.4</Version>
+    </PackageReference>
+    <PackageReference Include="Xam.Plugins.Settings">
+      <Version>2.6.0.12-beta</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.FFImageLoading">
+      <Version>2.2.9</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.FFImageLoading.Forms">
+      <Version>2.2.9</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms">
+      <Version>2.3.4.231</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="WindowsMobile, Version=10.0.16267.0">
+      <Name>Windows Mobile Extensions for the UWP</Name>
+    </SDKReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

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

@@ -1,27 +0,0 @@
-{
-  "dependencies": {
-    "Acr.UserDialogs": "6.3.3",
-    "IdentityModel": "1.3.1",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
-    "Newtonsoft.Json": "9.0.1",
-    "SlideOverKit": "2.1.4",
-    "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.3.4.231",
-    "Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
-    "Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/AppDelegate.cs

@@ -4,29 +4,17 @@ using UIKit;
 
 namespace eShopOnContainers.iOS
 {
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
     [Register("AppDelegate")]
     public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
     {
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
         public override bool FinishedLaunching(UIApplication app, NSDictionary options)
         {
             global::Xamarin.Forms.Forms.Init();
             LoadApplication(new App());
+
             SlideOverKit.iOS.SlideOverKit.Init();
             CachedImageRenderer.Init();
 
-            var x = typeof(Xamarin.Forms.Themes.LightThemeResources);
-            x = typeof(Xamarin.Forms.Themes.iOS.UnderlineEffect);
-
             return base.FinishedLaunching(app, options);
         }
     }

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs

@@ -0,0 +1,53 @@
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.iOS;
+using eShopOnContainers.iOS.Effects;
+using CoreGraphics;
+using CoreAnimation;
+
+[assembly: ExportEffect(typeof(CircleEffect), "CircleEffect")]
+namespace eShopOnContainers.iOS.Effects
+{
+    public class CircleEffect : PlatformEffect
+    {
+        protected override void OnAttached()
+        {
+            UpdateCircle();
+        }
+
+        protected override void OnDetached()
+        {
+            Container.Layer.Mask = null;
+        }
+
+        protected override void OnElementPropertyChanged(System.ComponentModel.PropertyChangedEventArgs args)
+        {
+            base.OnElementPropertyChanged(args);
+
+            if (args.PropertyName == VisualElement.WidthProperty.PropertyName ||
+                args.PropertyName == VisualElement.HeightProperty.PropertyName)
+            {
+                UpdateCircle();
+            }
+        }
+
+        private void UpdateCircle()
+        {
+            double width = ((VisualElement)Element).Width;
+            double height = ((VisualElement)Element).Height;
+
+            if (width <= 0 || height <= 0)
+            {
+                return;
+            }
+
+            double min = Math.Min(width, height);
+            var layerX = width > min ? (width - min) / 2 : 0;
+            var layerY = height > min ? (height - min) / 2 : 0;
+
+            var mask = new CAShapeLayer();
+            mask.Path = CGPath.EllipseFromRect(new CGRect(layerX, layerY, min, min));
+            Container.Layer.Mask = mask;
+        }
+    }
+}

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

@@ -27,7 +27,8 @@
     <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
-    <MtouchSdkVersion></MtouchSdkVersion>
+    <MtouchSdkVersion>
+    </MtouchSdkVersion>
     <MtouchProfiling>False</MtouchProfiling>
     <MtouchFastDev>False</MtouchFastDev>
     <MtouchUseLlvm>False</MtouchUseLlvm>
@@ -121,7 +122,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <ITunesArtwork Include="iTunesArtwork" />
     <ITunesArtwork Include="iTunesArtwork@2x" />
-    <None Include="packages.config" />
+    <Compile Include="Effects\CircleEffect.cs" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\Icon-60%403x.png" />
@@ -130,115 +131,9 @@
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Acr.Support.iOS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Forms.Touch, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
-    </Reference>
-    <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SlideOverKit.iOS, Version=1.0.6135.18893, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="WebP.Touch, Version=1.0.6230.37678, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.iOS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.iOS.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Theme.Light, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Light.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Light.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Xamarin.iOS" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="Autofac">
-      <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Platform.iOS">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Pages">
-      <HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator.Abstractions">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Plugin.Geolocator">
-      <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\fake_product_01.png" />
@@ -431,13 +326,24 @@
   <ItemGroup>
     <AndroidResource Include="Resources\default_campaign.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Acr.Support" version="2.1.0" />
+    <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
+    <PackageReference Include="Autofac" version="4.5.0" />
+    <PackageReference Include="IdentityModel" version="2.10.0" />
+    <PackageReference Include="modernhttpclient" version="2.4.2" />
+    <PackageReference Include="NETStandard.Library" version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
+    <PackageReference Include="PCLCrypto" version="2.0.147" />
+    <PackageReference Include="SlideOverKit" version="2.1.4" />
+    <PackageReference Include="Splat" version="1.6.2" />
+    <PackageReference Include="Validation" version="2.2.8" />
+    <PackageReference Include="WebP.Touch" version="1.0.3" />
+    <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
+    <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
+    <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
+    <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
+    <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-  </Target>
-  <Import Project="..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
 </Project>

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

@@ -12,6 +12,11 @@
   <package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
   <package id="NETStandard.Library" version="1.6.0" targetFramework="xamarinios10" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinios10" />
+  <package id="PCLCrypto" version="2.0.147" targetFramework="xamarinios10" />
+  <package id="PInvoke.BCrypt" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.Kernel32" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.NCrypt" version="0.3.2" targetFramework="xamarinios10" />
+  <package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="xamarinios10" />
   <package id="SlideOverKit" version="2.1.4" targetFramework="xamarinios10" />
   <package id="Splat" version="1.6.2" targetFramework="xamarinios10" />
   <package id="System.AppContext" version="4.1.0" targetFramework="xamarinios10" />
@@ -57,13 +62,11 @@
   <package id="System.Threading.Timer" version="4.0.1" targetFramework="xamarinios10" />
   <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="xamarinios10" />
   <package id="System.Xml.XDocument" version="4.0.11" targetFramework="xamarinios10" />
+  <package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
   <package id="WebP.Touch" version="1.0.3" targetFramework="xamarinios10" />
   <package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="xamarinios10" />
   <package id="Xam.Plugins.Settings" version="2.6.0.12-beta" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="xamarinios10" />
   <package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="xamarinios10" />
   <package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
-  <package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
 </packages>

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeFrameworkVersion>1.1.2</RuntimeFrameworkVersion>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
-    <OutputType>Exe</OutputType>
-    <PackageTargetFallback>$(PackageTargetFallback);netstandard1.6.1;dnxcore50;portable-net451+win8</PackageTargetFallback>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
@@ -18,23 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
-    <PackageReference Include="StackExchange.Redis" Version="1.2.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
-    <PackageReference Include="System.Threading" Version="4.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
-    <PackageReference Include="StackExchange.Redis" Version="1.2.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.2.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Services/Basket/Basket.API/Controllers/BasketController.cs

@@ -1,15 +1,12 @@
-using System;
+using Basket.API.IntegrationEvents.Events;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.Services.Basket.API.Model;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-using Basket.API.IntegrationEvents.Events;
-using Microsoft.eShopOnContainers.Services.Basket.API.Services;
 using Basket.API.Model;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+using Microsoft.eShopOnContainers.Services.Basket.API.Model;
+using Microsoft.eShopOnContainers.Services.Basket.API.Services;
+using System;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers
 {

src/Services/Basket/Basket.API/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:1.1.2
+FROM microsoft/aspnetcore:2.0
 ARG source
 WORKDIR /app
 EXPOSE 80

src/Services/Basket/Basket.API/Dockerfile.nanowin

@@ -1,8 +0,0 @@
-FROM microsoft/dotnet:1.1-runtime-nanoserver
-SHELL ["powershell"]
-ARG source
-WORKDIR /app
-RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord
-EXPOSE 80
-COPY ${source:-obj/Docker/publish} .
-ENTRYPOINT ["dotnet", "Basket.API.dll"]