# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs

# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Basket/Basket.API/Controllers/BasketController.cs
#	src/Services/Basket/Basket.API/Startup.cs

Fixed app crash when switching from mock to real services.

When the previous page is the MainView, switching from mock to real
services will force re-authentication by navigating to the LoginView.

# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln

Revert "Revert "Fix mac ci build""

Revert "Fix mac ci build"

Fix mac ci build

While at it, update the sh script too.

Use IEnumerable<dynamic> instead of dynamic for collections

Fixed Windows unit test runner project.

Updated deployment documentation

Xamarin client updates

Because of the using blocks, these one line methods need the async
modifier so that the that async state machiner is created. Otherwise, if
the method does not complete synchronously, the connection is closed
before the database has returned its results.

The methods that return collections should return
Task<IEnumerable<dynamic>> not Task<dynamic>

Minor fixes to Xamarin client.

Bumped Forms version from 2.3.3 to 2.3.4 + more tidy up.