Merge branch 'master' into xamarin

Author: David Britch

.gitignore

@@ -25,7 +25,7 @@ bld/
 # Visual Studio 2015 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
+**/wwwroot/lib/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -256,4 +256,5 @@ pub/
 /src/Services/Identity/eShopOnContainers.Identity/Properties/launchSettings.json
 
 #Ignore marker-file used to know which docker files we have.
-.eshopdocker_*
+.eshopdocker_*
+/src/Web/WebMVC/wwwroot/lib

README.md

@@ -14,11 +14,15 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
 **Architecture overview**: This reference application is cross-platform either at the server and client side, thanks to .NET Core services capable of running on Linux or Windows containers depending on your Docker host, and to Xamarin for mobile apps running on Android, iOS or Windows/UWP plus any browser for the client web apps. 
 The architecture proposes a simplified microservice oriented architecture implementation with multiple autonomous microservices (each one owning its own data/db) and implementing different approaches within each microservice (simple CRUD vs. DDD/CQRS patterns) using Http as the current communication protocol. 
 <p>
-The plan is to add asynchronous communication for data updates propagation across multiple services based on integration events and an event bus plus other features defined at the <a href='https://github.com/dotnet/eShopOnContainers/wiki/01.-Roadmap-and-Milestones-for-future-releases'>roadmap</a>. 
+It also supports asynchronous communication for data updates propagation across multiple services based on Integration Events and an Event Bus plus other features defined at the <a href='https://github.com/dotnet/eShopOnContainers/wiki/01.-Roadmap-and-Milestones-for-future-releases'>roadmap</a>. 
 <p>
 <img src="img/eshop_logo.png">
 <img src="img/eShopOnContainers_Architecture_Diagram.png">
 <p>
+The microservices are different in type, meaning different internal architecture patterns approaches depending on it purpose, as shown in the image below.
+<p>
+<img src="img/eShopOnContainers_Types_Of_Microservices.png">
+<p>
 <p>
 Additional miroservice styles with other frameworks and No-SQL databases will be added, eventually. This is a great opportunity for pull requests from the community, like a new microservice using Nancy, or even other languages like Node, Go, Python or data containers with MongoDB with Azure DocDB compatibility, PostgreSQL, RavenDB, Event Store, MySql, etc. You name it! :)
 
@@ -30,15 +34,14 @@ Additional miroservice styles with other frameworks and No-SQL databases will be
 ## Related documentation and guidance
 While developing this reference application, we are creating a reference Guide/eBook named <b>"Architecting and Developing Containerized and Microservice based .NET Applications"</b> which explains in detail how to develop this kind of architectural style (microservices, Docker containers, Domain-Driven Design for certain microservices) plus other simpler architectural styles, like monolithic apps that can also live as Docker containers.
 <p>
-There's also an additional eBook focusing on Containers/Docker lifecycle (DevOps, CI/CD, etc.) with Microsoft Tools, already published.
-You can start reviewing these Guides/eBooks here:
+There are also additional eBooks focusing on Containers/Docker lifecycle (DevOps, CI/CD, etc.) with Microsoft Tools, already published plus an additional eBook focusing on Enterprise Apps Patterns with Xamarin.Forms.
+You can download them and start reviewing these Guides/eBooks here:
 <p>
-You can download both eBooks from here:
 
-| Architecting & Developing | Containers Lifecycle & CI/CD |
-| ------------ | ------------|
-| <a href='docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf'><img src="img/ebook_arch_dev_microservices_containers_cover.png"> </a> | <a href='https://aka.ms/dockerlifecycleebook'> <img src="img/ebook_containers_lifecycle.png"> </a> |
-| <a href='docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf'>**Download** (Early DRAFT, still work in progress)</a> | <a href='https://aka.ms/dockerlifecycleebook'>**Download** - First Edition from late 2016</a> |
+| Architecting & Developing | Containers Lifecycle & CI/CD | App patterns with Xamarin.Forms |
+| ------------ | ------------|  ------------|
+| <a href='https://aka.ms/microservicesebook'><img src="img/ebook_arch_dev_microservices_containers_cover.png"> </a> | <a href='https://aka.ms/dockerlifecycleebook'> <img src="img/ebook_containers_lifecycle.png"> </a> | <a href='https://aka.ms/xamarinpatternsebook'> <img src="img/xamarin-enterprise-patterns-ebook-cover-small.png"> </a> |
+| <sup> <a href='https://aka.ms/microservicesebook'>**Download** (Early DRAFT, still work in progress)</a> </sup>  | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download** (First Edition from late 2016) </a>  </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download** (Early DRAFT, still work in progress) </a>  </sup> |
 
 Send feedback to [cesardl@microsoft.com](cesardl@microsoft.com)
 <p>
@@ -89,7 +92,7 @@ The app was also partially tested on "Docker for Mac" using a development MacOS
 
 ## Sending feedback and pull requests
 As mentioned, we'd appreciate to your feedback, improvements and ideas.
-You can create new issues at the issues section, do pull requests and/or send emails to eshop_feedback@service.microsoft.com
+You can create new issues at the issues section, do pull requests and/or send emails to **eshop_feedback@service.microsoft.com**
 
 ## Questions
 [QUESTION] Answer +1 if the solution is working for you (Through VS2017 or CLI environment):

cli-linux/build-bits-linux.sh

@@ -6,6 +6,7 @@ projectList=(
     "/src/Services/Identity/Identity.API"
     "/src/Web/WebMVC"
     "/src/Web/WebSPA"
+    "/src/Web/WebStatus
 )
 
 # Build SPA app
@@ -36,4 +37,4 @@ done
 #fi
 
 # No need to build the images, docker build or docker compose will
-# do that using the images and containers defined in the docker-compose.yml file.
+# do that using the images and containers defined in the docker-compose.yml file.

cli-mac/build-bits.sh

@@ -7,6 +7,7 @@ projectList=(
     "../src/Services/Identity/Identity.API"
     "../src/Web/WebMVC"
     "../src/Web/WebSPA"
+    "../src/Web/WebStatus"
 )
 
 for project in "${projectList[@]}"

cli-windows/build-bits-expanded.ps1

@@ -15,13 +15,14 @@ $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\Web\WebStatus";Prj="WebStatus.csproj"}
 
 $projectPaths | foreach {
     $projectPath = $_.Path
     $projectFile = $_.Prj
     $outPath = $_.Path + "\obj\Docker\publish"
     $projectPathAndFile = "$projectPath\$projectFile"
-    Write-Host "Deleting $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
     dotnet restore $projectPathAndFile

cli-windows/build-bits.ps1

@@ -33,6 +33,7 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:5105
       - 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=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-5105.  
     ports:
@@ -44,6 +45,7 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:5102
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
       - identityUrl=http://identity.api:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
+      - BasketUrl=http://basket.api:5103
       - EventBusConnection=rabbitmq
     ports:
       - "5102:5102"
@@ -85,7 +87,7 @@ services:
       - CatalogUrl=http://catalog.api:5101/hc
       - OrderingUrl=http://ordering.api:5102/hc
       - BasketUrl=http://basket.api:5103/hc
-      - IdentityUrl=http://10.0.75.1:5105/hc
+      - IdentityUrl=http://identity.api:5105/hc
       - mvc=http://webmvc:5100/hc
       - spa=http://webspa:5104/hc
     ports:

docker-compose.override.yml

@@ -19,6 +19,7 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:5103
       - ConnectionString=basket.data
       - identityUrl=http://identity.api:5105              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
+      - EventBusConnection=rabbitmq
     ports:
       - "5103:5103"
 
@@ -28,6 +29,7 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:5101
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
       - ExternalCatalogBaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101    #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105.
+      - EventBusConnection=rabbitmq
     ports:
       - "5101:5101"
 
@@ -38,6 +40,7 @@ services:
       - SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
       - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word 
       - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100              #Local: You need to open your host's firewall at range 5100-5105.  
+      - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
     ports:
       - "5105:5105"
 
@@ -47,6 +50,8 @@ services:
       - ASPNETCORE_URLS=http://0.0.0.0:5102
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
       - identityUrl=http://identity.api:5105              #Local: You need to open your host's firewall at range 5100-5105.  at range 5100-5105. 
+      - BasketUrl=http://basket.api:5103
+      - EventBusConnection=rabbitmq
     ports:
       - "5102:5102"
 
@@ -81,10 +86,13 @@ services:
 
   webstatus:
     environment:
-      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_ENVIRONMENT=Production
+      - ASPNETCORE_URLS=http://0.0.0.0:5107
       - CatalogUrl=http://catalog.api:5101/hc
       - OrderingUrl=http://ordering.api:5102/hc
       - BasketUrl=http://basket.api:5103/hc
-      - IdentityUrl=http://10.0.75.1:5105/hc
+      - mvc=http://webmvc:5100/hc
+      - spa=http://webspa:5104/hc
+      - 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.    
     ports:
-      - "5107:5107"
+      - "5107:5107"