Christian Arenas 8d3ae671a8 Merge remote-tracking branch 'origin/dev' into marketingcampaing ...

# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln

2017-06-01 20:19:33 +02:00

..

Basket/Basket.API

Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI.

2017-05-25 17:01:10 -07:00

Catalog/Catalog.API

Resilience enhancements.

2017-06-01 14:32:22 +02:00

Identity/Identity.API

Add marketing resource to identity

2017-06-01 10:10:37 +02:00

Marketing/Marketing.API

Add marketing api

2017-06-01 20:15:21 +02:00

Ordering

Resilience enhancements.

2017-06-01 14:32:22 +02:00