diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
deleted file mode 100644
index f8b4888..0000000
--- a/.vs/ProjectSettings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "CurrentProjectSetting": null
-}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index a5d9ae7..0000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ExpandedNodes": [
- ""
- ],
- "SelectedNode": "\\03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md",
- "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/.vs/eShopOnContainers.wiki/v15/.suo b/.vs/eShopOnContainers.wiki/v15/.suo
deleted file mode 100644
index aa2fcee..0000000
Binary files a/.vs/eShopOnContainers.wiki/v15/.suo and /dev/null differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
deleted file mode 100644
index bc53b18..0000000
Binary files a/.vs/slnx.sqlite and /dev/null differ
diff --git a/00.-Dev-machine-requirements.md b/00.-Dev-machine-requirements.md
deleted file mode 100644
index e2b8796..0000000
--- a/00.-Dev-machine-requirements.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Windows dev machine
-
-## Recommended Hardware requirements:
-- 16Gb of memory RAM - Since you need Hyper-V for Docker for Windows in order to run the Linux Docker Host and we're also running a SQL Server container and a Redis container, 8Gb of RAM might not be enough.
-
-## Software requirements for Windows are:
-- Docker for Windows (From Docker) - Requires Windows 10 Pro 64 bits
-- .NET Core 1.1 SDK
-- (Optional) VS 2017 – Much better for debugging multi-containers apps
-
-The requirements for VS 2017 are:
-Supported Operating Systems Visual Studio 2017 will install and run on the following operating systems:
-• Windows 10 version 1507 or higher: Home, Professional, Education, and Enterprise (LTSB is not supported)
-• Windows Server 2016: Standard and Datacenter
-• Windows 8.1 (with Update 2919355): Basic, Professional, and Enterprise
-• Windows Server 2012 R2 (with Update 2919355): Essentials, Standard, Datacenter
-• Windows 7 SP1 (with latest Windows Updates): Home Premium, Professional, Enterprise, Ultimate
-
-However, the requirements for “Docker for Windows” are more restrictive:
-https://docs.docker.com/docker-for-windows/install/#download-docker-for-windows
-
-• Docker for Windows requires 64bit Windows 10 Pro, Enterprise and Education (1511 November update, Build 10586 or later) and Microsoft Hyper-V. Please see What to know before you install for a full list of prerequisites.
-
-
-
-# Mac dev machine
-
-## Recommended Hardware requirements:
-- 16Gb of memory RAM - Since you a VM in the Mac with the Linux Docker host and we're also running a SQL Server container and a Redis container, 8Gb of RAM might not be enough.
-
-## Software requirements for Mac are:
-- Docker for Mac (From Docker) - Requires OS X El Capitan 10.11 or newer macOS.
-- .NET Core 1.1 SDK for Mac
-- (Optional) Visual Studio Code for Mac
-
-Docker for Mac requires OS X El Capitan 10.11 or newer macOS release running on a 2010 or newer Mac, with Intel’s hardware support for MMU virtualization.
-
-## Questions
-[QUESTION] Answer +1 if the solution is working for you (Through VS2017 or CLI environment):
-https://github.com/dotnet/eShopOnContainers/issues/107
\ No newline at end of file
diff --git a/01.-Roadmap-and-Milestones-for-future-releases.md b/01.-Roadmap-and-Milestones-for-future-releases.md
index 9e055b8..178d7c7 100644
--- a/01.-Roadmap-and-Milestones-for-future-releases.md
+++ b/01.-Roadmap-and-Milestones-for-future-releases.md
@@ -1,4 +1,5 @@
## Version 0.1 (ALPHA, current version - Early March 2017)
+
- Available at the MASTER branch.
- Docker containers with .NET Core and Linux images support/tested. Windows Containers are work-in-progress.
- .NET 1.1 and EF 1.1 support
@@ -69,7 +70,7 @@ Our task here will be to use that new lib.
- Solid API contracts (based probably on Swagger, but interoperable with any language and explicit per paramater)
## Future versions - Roadmap (After April 2017)
-
+
- Production-Ready Cloud application with Resilient microservices' design and implementation
- Gracefully stopping or shutting down microservice instances - Implemented as an ASP.NET Core middleware in the ASP.NET Core pipeline. Drain in-flight requests before stopping the microservice/container process.
- Implement messaging communication to ensure Commands/Updates' communication success, using queues, etc. plus providing better scalability capabilities.
diff --git a/02.-Setting-eShopOnContainer-solution-up-in-a-Visual-Studio-2017-environment.md b/02.-Setting-eShopOnContainer-solution-up-in-a-Visual-Studio-2017-environment.md
deleted file mode 100644
index eb84198..0000000
--- a/02.-Setting-eShopOnContainer-solution-up-in-a-Visual-Studio-2017-environment.md
+++ /dev/null
@@ -1,236 +0,0 @@
-## Want to try it out from Visual Studio 2017?
-
-Main steps:
-
-```
-- Git clone https://github.com/dotnet/eShopOnContainers.git
-- Open solution eShopOnContainers-ServicesAndWebApps.sln
-- Hit F5!
-```
-NOTE: In order for the authentication based on the STS (Security Token Service) to properly work and have access from remote client apps like the Xamarin mobile app, you also need to open the ports in your firewall as specified in the procedure below.
-For further instructions, especially if this is the first time you are going to try .NET Core on Docker, see the detailed instructions below. Also **you'll need it the first time in order to make the SPA (Single Page Application) work (npm install, etc.)**
-
---------------------------------------------------------------------
---------------------------------------------------------------------
-
-
-## Detailed procedure: Setting eShopOnContainers up in a Visual Studio 2017 development machine
-Visual Studio 2017 with its built-in Docker Tools adds a number of very convenient features which are solid reasons why you'd want to use VS 2017 when developing Docker container based applications. The most important features are:
-* Multi-container debugging, supporting true microservice scenarios
-* Windows Server Containers for .NET Framework apps
-* Addition of CI build definition using a docker-compose.ci.build.yml file at the solution level.
-* Configure Continuous Integration experience for setting up CI/CD with VSTS to Azure Container Services
-
-Being the first one (Multi-container debugging, supporting true microservice scenarios) the most loved feature, probably.
-So, here's how to setup a VS 2017 environment where you can test eShopOnContainers.
-
-### GitHub branch to use
-By default, use the MASTER branch which supports .CSPROJ and VS 2017.
-
-### Software requirements
-Software installation requirements for a Windows dev machine with Visual Studio 2017 and Docker for Windows:
-- Docker for Windows with the concrete configuration specified below.
-- Visual Studio 2017 (Latest version) with the workloads specified below.
-- NPM and related dependencies for running the SPA Web app. Setup process described here
-
-### Installing and configuring Docker in your development machine
-
-#### Install Docker for Windows
-Install Docker for Windows (The Stable channel should suffice) from this page: https://docs.docker.com/docker-for-windows/install/
-About further info on Docker for windows, check this additional page
-https://docs.docker.com/docker-for-windows/
-
-Docker for Windows uses Hyper-V to run a Linux VM which is the by default Docker host. If you don't have Hyper-V installed/enabled, it'll be installed and you will probably need to reboot your machine. Docker's setup should warn you about it, though.
-
-**IMPORTANT**: Check that you don't have any other hypervisor installed that might be not compatible with Hyper-V. For instance, Intel HAXM can be installed by VS 2017 if you chose to install Google's Android emulator which works on top of Intel HAXM. In that case, you'd need to uninstall Google's Android emulator and Intel HAXM.
-VS 2017 recommends to install the Google Android emulator because it is the only Android emulator with support for Google Play Store, Google Maps, etc. However, take into account that it currently is not compatible with Hyper-V, so you might have incompatibilities with this scenario.
-
-#### Set needed assigned Memory and CPU to Docker
-For the development environment of eShopOnContainers, by default, it runs 1 instance of SQL Server running as a container with multiple databases (one DB per microservice), other 6 additional ASP.NET Core apps/services each one running as a container, plus 1 Redis server running as a container. Therefore, especially because of the SQL Server requirements on memory, it is important to set Docker up properly with enough memory RAM and CPU assigned to it or you will get errors when starting the containers with VS 2017 or "docker-compose up".
-
-Once Docker for Windows is installed in your machine, enter into its Settings and the Advanced menu option so you are able to adjust it to the minimum amount of memory and CPU (Memory: Around 4096MB and CPU:3) as shown in the image. Usually you might need a 16GB memory machine for this configuration if you also want to run the Android emulator for the Xamarin app or multiple instances of applications demanding significant memory at the same time. If you have a less powerful machine, you can try with a lower configuration and/or by not starting certain containers like the basket and Redis. But if you don't start all the containers, the application will not fully function properly, of course.
-
-
-
-#### Share drives in Docker settings (In order to deploy and debug with Visual Studio 2017)
-(Note, this is not required if running from Docker CLI with docker-compose up and using VS 2015 or any other IDE or Editor)
-In order to deploy/debug from Visual Studio 2017, you'll need to share the drives from Settings-> Shared Drives in the "Docker for Windows" configuration. -If you don't do this, you will get an error when trying to deploy/debug from VS 2017, like "Cannot create container for service yourApplication: C: drive is not shared".
-The drive you'll need to share depends on where you place your source code.
-
-
-
-
-
-### IMPORTANT: Open ports in local Firewall so Authentication to the STS (Security Token Service container) can be done through the 10.0.75.1 IP which should be available and already setup by Docker. Also needed for client remote apps like Xamarin app or SPA app in remote browser.
-- You can manually create a rule in your local firewall in your development machine or you can also create that rule by just executing the add-firewall-docker.ps1 script available in the solution's **cli-windows** folder.
-- Basically, you need to open the ports 5100 to 5105 that are used by the solution by creating an IN-BOUND RULE in your firewall, as shown in the screenshot below (for Windows).
-
-
-
-### Installing and configuring Visual Studio 2017 in your development machine
-
-#### Install Visual Studio 2017
-Once you have the bits downloaded locally, run the VS 2017 setup file and select the following workloads depending on the apps you intend to test or work with:
-
-##### Working only with the server side (Microservices and web applications) - Workloads
-
-- ASP.NET and web development
-- .NET Core cross-platofrm development
-- Azure development (Optional) - It is optional but recommended in case you want to deploy to Docker hosts in Azure or use any other infrastructure in Azure.
-
-
-##### Working with the mobile app (Xamarin Mobile apps for iOS, Android and Windows UWP) - Workloads
-If you also want to test/work with the eShopOnContainer model app based on Xamarin, you need to install the following additional workloads:
-- Mobile development with .NET (Xamarin)
-- Universal Windows Platform development
-- .NET desktop development (Optional) - This is not required, but just in case you also want to make tests consuming the microservices from WPF or WinForms desktop apps
-
-
-
-IMPORTANT: As mentioned above, make sure you are NOT installing Google's Android emlulator with Intel HAXM hypervisor or you will run on an incompatibility and Hyper-V won't work in your machine, therefore, Docker for Windows wont work when trying to run the Linux host or any host witih Hyper-V.
-
-Make sur eyou are NOT selecting
-the highlighted options below with a red arrows:
-
-
-
-
-### Clone the eShopOnContainers code from GitHub
-By default, clone the MASTER branch which is VS 2017 comaptible:
-
-
-
-So make sure you switch to that branch in VS 2017 after cloning or clone that beanch with a Git command, from command prompt or PowerShell, similar to:
-
- git clone https://github.com/dotnet/eShopOnContainers.git
-
-
-### Open eShopOnContainers solution, Build, Run
-
-#### Open eShopOnContainers solution in Visual Studio 2017
-
-- If testing/working only with the server-side applications and services, open the solution: **eShopOnContainers-ServicesAndWebApps.sln**
-
-- If testing/working either with the servier-side applications and services plus the Xamarin mobile apps, open the solution: **eShopOnContainers.sln**
-
-Below you can see the full **eShopOnContainers-ServicesAndWebApps.sln** solution (server side) opened in Visual Studio 2017:
-
-
-
-Note how VS 2017 loads the docker-compose.yml files in a special node-tree so it uses that configuration to deploy/debug all the containers configured, at the same time into your Docker host.
-
-#### Build the Web SPA application with NPM
-If you want to run/test the web eShopOnContainers SPA (Single Page Application) client in adition to the regular MVC Web app, you need to install certain dependencies for the client side and build it with "npm build", as the client side of the SPA app is based on ANGULAR 2, TypeScript and other JS frameworks and compilation that needs to happen before building the Docker images.
-The process is described in detail here:
-https://github.com/dotnet/eShopOnContainers/wiki/06.-Setting-the-Web-SPA-application-up
-
-Come back to this point when you finished with the "Setting the SPA up" process.
-
-
-#### Build and run eShopOnContainers from Visual Studio 2017
-
-##### Set docker-compose as the default StartUp project
-In case it is not your "by default project", right click on the "docker-compose" node and select the "Set as Startup Project" menu option, as shwon below:
-
-
-At this point, after waiting sometime for the Nuget packages to be properly restored, you should be able to build the whole solution or even directly deploy/debug it into Docker by simple hitting F5 or pressing the debug "Play" button that now should be labeled as "Docker":
-
-
-
-VS 2017 should compile the .NET projects, then create the Docker images and finally deploy the containers in the Docker host (your by default Linux VM in Docker for Windows).
-Note that the first time you hit F5 it'll take more time, a few minutes at least, because in addition to compile your bits, it needs to pull/download the base images (SQL for Linux Docker Image, Redis Image, ASPNET image, etc.) and register them in the local image repo of your PC. The next time you hit F5 it'll be much faster.
-
-Finally, because the docker-compose configuration project is configured to open the MVC application, it should open your by default browser and show the MVC application with data coming from the microservices/containers:
-
-
-Here's how the docker-compose configuration project is configured to open the MVC application:
-
-
-
-Finally, you can check out how the multiple containers are runnin in your Docker host by running the command **"docker ps"** like below:
-
-
-
-You can see the 8 containers are running and what ports are being exposed, etc.
-
-### Debug with several breakpoints across the multiple containers/projects
-
-Something very compelling and productive in VS 2017 is the capability to debug several breakpoints across the multiple containers/projects.
-For instance, you could set a breakpoint in a controller within the MVC web app plus a second breakpoint in a second controller within the Catalog Web API microservice, then refresh the browser if you were still running the app or F5 again, and VS will be stopping within your microservices running in Docker as shown below! :)
-
-Breakpoint at the MVC app running as Docker container in the Docker host:
-
-
-Press F5 again...
-
-Breakpoint at the Catalog microservice running as Docker container in the Docker host:
-
-
-And that's it! Super simple! Visual Studio is handling all the complexities under the covers and you can directly do F5 and debug a multi-container application!
-
-
-### Test the SPA Web app
-While having the containers running, open a browser and type `http://localhost:5104/` and hit enter.
-You should see the SPA application like in the following screenshot:
-
-
-
-
-
-### Test a microservice's Swagger interface (i.e. the Catalog microservice)
-While having the containers running, open a browser and type `http://localhost:5101` and hit enter.
-You should see the Swagger page for that microservice that allows you to test the Web API, like in the following screenshot:
-
-
-
-Then, after providing the size (i.e. 10) and the current page (i.e. 1) for the data of the catalog, you can run the service hitting the "Try it out!" button and see the returned JSON Data:
-
-
-
-
-----
-
-### Testing all the applications and microservices
-Once the containers are deployed, you should be able to access any of the services in the following URLs or connection string, from your dev machine:
-
-
-- Web MVC: http://localhost:5100
-- Web Spa: http://localhost:5104 (Important, check how to set up the SPA app and requirements before building the Docker images. Instructions at https://github.com/dotnet/eShopOnContainers/wiki/06.-Setting-the-Web-SPA-application-up)
-- Catalog microservice: http://localhost:5101 (Not secured)
-- Ordering microservice: http://localhost:5102 (Requires token for authorization)
-- Basket microservice: http://localhost:5103 (Requires token for authorization)
-- Identity microservice: http://localhost:5105
-- Orders database (SQL Server connection string): Server=tcp:localhost,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
-- Catalog database (SQL Server connection string): Server=tcp:localhost,5434;Database=CatalogDB;User Id=sa;Password=Pass@word
-- ASP.NET Identity database (SQL Server connection string): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
-- Basket data (Redis): listening at localhost:6379
-
-#### Creating and Order and Authenticating on the Web MVC application with the DemoUser@microsoft.com user account
-When you try the Web MVC application by using the url http://localhost:5100, you'll be able to test the home page which is also the catalog page. But if you want to add articles to the basket you need to login first at the login page which is handled by the STS microservice/container (Security Token Service). At this point, you could register your own user/customer or you can also use a convenient default user/customer named **demoUser@microsoft.com** so you don't need to register your own user and it'll be easier to test.
-The credentials for this demo user are:
-- User: **demouser@microsoft.com**
-- Password: **Pass@word1**
-
-Below you can see the login page when providing those credentials.
-
-
-#### Trying the Xamarin.Forms mobile apps for Android, iOS and Windows
-You can deploy the Xamarin app to real iOS, Android or Windows devices.
-You can also test it on an Android Emulator based on Hyper-V like the Visual Studio Android Emulator (Do NOT install the Google's Android emulator or it will break Docker and Hyper-V, as mentioned aboce).
-
-By default, the Xamarin app shows fake data from mock-services. In order to really access the microservices/containers in Docker from the mobile app, you need to:
- - Disable mock-services in the Xamarin app by setting the UseMockServices = false in the App.xaml.cs and specify the host IP in BaseEndpoint = "http://10.106.144.28" at the GlobalSettings.cs. Both files in the Xamarin.Forms project (PCL).
- - Another alternative is to change that IP through the app UI, by modifying the IP address in the Settings page of the App as shown in the screenshot below.
-- In addition, you need to make sure that the used TCP ports of the services are open in the local firewall.
-
-
-## Sending feedback and pull requests
-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
-
-## Questions
-[QUESTION] Answer +1 if the solution is working for you (Through VS2017 or CLI environment):
-https://github.com/dotnet/eShopOnContainers/issues/107
-
-
diff --git a/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md b/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md
deleted file mode 100644
index 5b813ef..0000000
--- a/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md
+++ /dev/null
@@ -1,271 +0,0 @@
-## Want to try it out from the CLI?
-
-Main steps:
-
-```
-- Git clone https://github.com/dotnet/eShopOnContainers.git
-- Docker-compose -f docker-compose.ci.build.yml up
-- Docker-compose up
-```
-NOTE: In order for the authentication based on the STS (Security Token Service) to properly work and have access from remote client apps like the Xamarin mobile app, you also need to open the ports in your firewall as specified in the procedure below.
-For further instructions, especially if this is the first time you are going to try .NET Core on Docker, see the detailed instructions below. This is also important in order to make the SPA app (Single Page Application) to work as there are some considerations (npm install, etc.) in regards when using NPM from Windows and Linux (the build container).
-
---------------------------------------------------------------------
---------------------------------------------------------------------
-
-## Detailed procedure - Setting eShopOnContainers up in a CLI and Windows based development machine
-This CLI environment means that you want to build/run by using the CLI (Command line interface) available in .NET Core (dotnetcore) and Docker CLI.
-
-You don't need Visual Studio 2017 for this environment but can use any code editor like Visual Studio Code, Sublime, etc. Of course, you could still use VS 2017 at the same time, as well.
-
-### GitHub branch to use/pull
-By default, use the MASTER branch which supports .CSPROJ projects and .NET Core 1.1 CLI and Docker CLI. The same branch's code supports Visual Studio 2017 or CLI scenarios, simultaneously, depending on each developer's preference.
-
-### Approach building bits from a container instead of the local dev-machine
-The recommended approach is to build the .NET bits and Docker images by using an special build container/image that should be used either from the CLI or your CI/CD pipeline. Doing that way you'll make sure that what you run and test locally is also built the same way by your CI/CD pipleine (having the same dependencies available within the build container, etc.).
-
-The build container to use is based on the `image: microsoft/aspnetcore-build:1.0-1.1` ASP.NET Core build image which includes the .NET SDK, NPM and many other Web and ASP.NET dependencies (Gulp, Bower, etc.) to build your services and web apps.
-See building procedure below.
-
-
-### Software requirements
-Software installation requirements for a Windows dev machine with CLI SDKs, "Docker for Windows" and Visual Studio Code or any other editor.
-
-WINDOWS DEV MACHINE
-- Docker for Windows. Important, follow the concrete configuration specified in the steps below.
-- Git for Windows. Have your preferred way to install and have available the git command line tool. Either Git for Windows or Git for Desktop can also work.
-- .NET Core SDK - Latest version. As of early March 2017, using .NET 1.1 SDK. Note that this requirement is optional because when building through the "build container" it will be using the .NET SDK available within the ASPNETCore build image, not the local .NET Core SDK. However, it is recommended to have it installed locally for any further building/testing of the ASP.NET Core projects without Docker.
-- Visual Studio Code or any other code editor.
-- NPM and related dependencies for running the SPA Web app. SPA app setup process described here.
-
-## Setting up the development environment
-
-### Installing and configuring Docker in your development machine
-
-#### Install Docker for Windows
-Install Docker for Windows (The Stable channel should suffice) from this page: https://docs.docker.com/docker-for-windows/install/
-About further info on Docker for windows, check this additional page
-https://docs.docker.com/docker-for-windows/
-
-Docker for Windows uses Hyper-V to run a Linux VM which is the by default Docker host. If you don't have Hyper-V installed/enabled, it'll be installed and you will probably need to reboot your machine. Docker's setup should warn you about it, though.
-
-**IMPORTANT**: Check that you don't have any other hypervisor installed that might be not compatible with Hyper-V. For instance, Intel HAXM can be installed by VS 2017 if you chose to install Google's Android emulator which works on top of Intel HAXM. In that case, you'd need to uninstall Google's Android emulator and Intel HAXM.
-VS 2017 recommends to install the Google Android emulator because it is the only Android emulator with support for Google Play Store, Google Maps, etc. However, take into account that it currently is not compatible with Hyper-V, so you might have incompatibilities with this scenario.
-
-#### Set needed assigned Memory and CPU to Docker
-For the development environment of eShopOnContainers, by default, it runs 1 instance of SQL Server running as a container with multiple databases (one DB per microservice), other 6 additional ASP.NET Core apps/services each one running as a container, plus 1 Redis server running as a container. Therefore, especially because of the SQL Server requirements on memory, it is important to set Docker up properly with enough memory RAM and CPU assigned to it or you will get errors when starting the containers with "docker-compose up".
-
-Once Docker for Windows is installed in your machine, enter into its Settings and the Advanced menu option so you are able to adjust it to the minimum amount of memory and CPU (Memory: Around 4096MB and CPU:3) as shown in the image. Usually you might need a 16GB memory machine for optimal configuration.
-
-
-
-#### Share drives in Docker settings
-Tis is an important and required configuration step in order to build the bits from the build-container so it has access to the solution files.
-You need to share the drives from Settings-> Shared Drives in the "Docker for Windows" configuration. -If you don't do this, you will get an error when trying to build from te container, like "Cannot create container for service yourApplication: C: drive is not shared".
-The drive you'll need to share depends on where you place your source code.
-
-
-
-
-### IMPORTANT: Open ports in local Firewall so Authentication to the STS (Security Token Service container) can be done through the 10.0.75.1 IP which should be available and already setup by Docker. Also needed for client remote apps like Xamarin app or SPA app in remote browser.
-- You can manually create a rule in your local firewall in your development machine or you can also create that rule by just executing the add-firewall-docker.ps1 script available in the solution's **cli-windows** folder.
-- Basically, you need to open the ports 5100 to 5105 that are used by the solution by creating an IN-BOUND RULE in your firewall, as shown in the screenshot below (for Windows).
-
-
-### .NET Core SDK setup
-(OPTIONAL) As mentioned, this requirement is optional because when building through the "build container" it will be using the .NET SDK available within the ASPNETCore build image, not the local .NET Core SDK. However, it is recommended to have it installed locally for any further building/testing of the ASP.NET Core projects without Docker.
-The .NET Core SDK install the .NET Core framework plus the SDK CLI tools with commands like "dotnet build", "dotnet publish", etc.
-
-Install the .NET Core SDK from here
-https://www.microsoft.com/net/download/core#/current
-(Current/x64 .NET Core 1.1 SDK Installer, usually)
-
-Run the setup like in the following screenshot:
-
-
-### Install NPM
-In order to be able to build the JavaScript dependencies from command line by using npm you need to install npm globally.
-
-NPM is bundled with NODE.JS. Installing NPM and NODE is pretty straightforward by using the installer package available at https://nodejs.org/en/
-
-
-You can install the version "Recommended For Most Users" of Node which at the moment of this writing was v6.10.0 LTS.
-
-
-
-
-After installing Node, you can check the installed NPM version with the command npm -v, as shown below. -
-
-
-## Clone the eShopOnContainers GitHub code Repository into your dev machine
-
-Clone the code from: https://github.com/dotnet/eShopOnContainers.git
-as in the following screenshot:
-
-
-## Get NPM dependencies for the SPA application
-
-Move to the SPA app folder (`cd eShopOnContainers\src\Web\WebSPA`) and run `npm install`
-
-After a successful execution of npm intall, move to the next step.
-
-
-## Build the bits through the build container image
-
-This step is very much simplified thanks to the mentioned compilation process based on a build-container using the image `image: microsoft/aspnetcore-build:1.0-1.1` ASP.NET Core build image which includes the .NET SDK, NPM and many other Web and ASP.NET dependencies (Gulp, Bower, etc.) to build your services and web apps.
-
-Move to the root folder of the solution:
-`cd YourPath\eShopOnContainers\` -
-Then, run the following docker-compose command which is using a special docker-compose file (docker-compose.ci.build.yml) which internally is spinning up the mentioned "build container".
-
-`docker-compose -f docker-compose.ci.build.yml up`
-
-
-The first time you run this command it'll take some more additional time as it needs to pull/download the aspnet-build image with all the SDKs as part of that build-image, so it'll take its time.
-
-It should take a few minutes to compile the .NET Core projects plus the SPA application (TypeScript/JavaScript).
-It should end with something like the following screenshot:
-
-
-
-At this point you have the .NET bits ready. Now, create the Docker images and run the containers.
-
-### Build Images and Deploy containers into your Docker host
-
-You can build the Docker images and deploy the containers to a regularDocker host by using the Docker CLI tool `docker-compose up` which is very convenient for multi-container applications as it can build all the Docker images for you and then spin-up all the multiple containers of your application, all with a single command.
-If you don't want to deploy the containers but only build the images, you can do so by running `docker-compose build`
-These are the steps:
-
-- **Build images and run your containers in your local host:** Open your favorite command tool (PowerShell od CommandLine in Windows / Bash in Mac) and move to the root directory of the solution where the docker-compose.yml files are located and run the command `docker-compose up`. If this is the first time you run it, it will also build the docker images. Other than that, you could also force to build the images by running `docker-compose build` previously.
-When running `docker-compose up` you should see something similar to the following screenshot in the PowerShell command window, although it will much longer than that, building the images the first time and showing many internal SQL commands from the services when populating sample data for your application.
-
- `docker-compose up`
-
-
- Note that the first time you try to build any image or run any container (with docker run or docker-compose) it detects that it needs the base images you are using, like the SQL Server image and the Redis image, so it will pull or download those base images from the Internet, from the public repo at the Docker registry named DOCKER HUB, by pulling the "microsoft/mssql-server-linux" which is the base image for the SQL Server for Linux on containers, and the "library/redis" which is the base Redis image. Therefore, the first time you run docker-compose it might take a few minutes pulling those images before it spins up your custom containers.
- The next time you run docker-compose up, since it'll have those base images already pulled/downloaded, it will be much faster.
-
- Because in eShopOnContainers' docker-compose.yml files it is also specified to build the custom Docker images, it is building it, like in the screenshot below (part of the same command execution):
-
-
- Finally, you can see how the scripts waits after deploying all the containers:
-
-
-- The next time you run "docker-compose up" again (you don't need to repeat it now), because now you already have all the base images downloaded and registered in your local repo and your custom images built and ready to go, it'll be much faster since it just needs to deploy the containers, like the following screenshot:
-
-
-- Check out the containers running in your Docker host: Once docker-compose up finishes, you will have the original PowerShell window busy and showing the execution's output in a "wait state", so in order to ask to Docker about "how it went" and see what containers are running, you need to open a second PowerShell window and type "docker ps" so you'll see all the running containers, as shown in the following screenshot.
-
-
- You can see the 6 custom containers running the 4 microservices plus the 2 web applications. In addition you have the SQL container with the databases (if you had a lot of memory, you could put one database per SQL container, too) and the Redis cache for the basket microservice data.
-
-- You can also check out with Docker CLI the images generated by typing in the PowerShell console the command: `docker images`
-
-
- Those Docker images are the ones you have available in your local image repository in your machine.
-You might have additional images, but at least, you should see the following list of images which are 6 custom images starting with the prefix "eshop" which is the name of the image repo. The rest of the images that are not starting with "eshop" will probably be official base-images like the microsoft/aspnetcore or the SQL Server for Linux images.
-
-### Test the MVC Web app
-Open a browser and type `http://localhost:5100/` and hit enter.
-You should see the MVC application like in the following screenshot:
-
-
-
-
-
-### Test the SPA Web app
-Open a browser and type `http://localhost:5104/` and hit enter.
-You should see the SPA application like in the following screenshot:
-
-
-
-
-
-### Test a microservice's Swagger interface (i.e. the Catalog microservice)
-Open a browser and type `http://localhost:5101` and hit enter.
-You should see the Swagger page for that microservice that allows you to test the Web API, like in the following screenshot:
-
-
-
-Then, after providing the size (i.e. 10) and the current page (i.e. 1) for the data of the catalog, you can run the service hitting the "Try it out!" button and see the returned JSON Data:
-
-
-
-
-### Using Visual Code to edit C# code or .yml code
-After installing VS code from Visual Studio Code you can edit particular file or "open" the whole solution forlder like in the following screenshots:
-
-`Opening the Solution's folder`
-
-
-`Editing a .yml file`
-
-
-It is also recommended to install the C# extension and the Docker extension for VS Code:
-
-
-
-----
-
-### Testing all the applications and microservices
-Once the containers are deployed, you should be able to access any of the services in the following URLs or connection string, from your dev machine:
-
-
-- Web MVC: http://localhost:5100
-- Web Spa: http://localhost:5104 (Important, check how to set up the SPA app and requirements before building the Docker images. Instructions at https://github.com/dotnet/eShopOnContainers/tree/master/src/Web/WebSPA/eShopOnContainers.WebSPA or the README.MD from eShopOnContainers/src/Web/WebSPA/eShopOnContainers.WebSPA)
-- Catalog microservice: http://localhost:5101 (Not secured)
-- Ordering microservice: http://localhost:5102 (Requires token for authorization)
-- Basket microservice: http://localhost:5103 (Requires token for authorization)
-- Identity microservice: http://localhost:5105
-- Orders database (SQL Server connection string): Server=tcp:localhost,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
-- Catalog database (SQL Server connection string): Server=tcp:localhost,5434;Database=CatalogDB;User Id=sa;Password=Pass@word
-- ASP.NET Identity database (SQL Server connection string): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
-- Basket data (Redis): listening at localhost:6379
-
-#### Creating and Order and Authenticating on the Web MVC application with the DemoUser@microsoft.com user account
-When you try the Web MVC application by using the url http://localhost:5100, you'll be able to test the home page which is also the catalog page. But if you want to add articles to the basket you need to login first at the login page which is handled by the STS microservice/container (Security Token Service). At this point, you could register your own user/customer or you can also use a convenient default user/customer named **demoUser@microsoft.com** so you don't need to register your own user and it'll be easier to test.
-The credentials for this demo user are:
-- User: **demouser@microsoft.com**
-- Password: **Pass@word1**
-
-Below you can see the login page when providing those credentials.
-
-
-#### Trying the Xamarin.Forms mobile apps for Android, iOS and Windows
-You can deploy the Xamarin app to real iOS, Android or Windows devices.
-You can also test it on an Android Emulator based on Hyper-V like the Visual Studio Android Emulator (Do NOT install the Google's Android emulator or it will break Docker and Hyper-V, as mentioned aboce).
-
-By default, the Xamarin app shows fake data from mock-services. In order to really access the microservices/containers in Docker from the mobile app, you need to:
- - Disable mock-services in the Xamarin app by setting the UseMockServices = false in the App.xaml.cs and specify the host IP in BaseEndpoint = "http://10.106.144.28" at the GlobalSettings.cs. Both files in the Xamarin.Forms project (PCL).
- - Another alternative is to change that IP through the app UI, by modifying the IP address in the Settings page of the App as shown in the screenshot below.
-- In addition, you need to make sure that the used TCP ports of the services are open in the local firewall.
-
-## Sending feedback and pull requests
-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
-
-## Questions
-[QUESTION] Answer +1 if the solution is working for you (Through VS2017 or CLI environment):
-https://github.com/dotnet/eShopOnContainers/issues/107
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-Code-and-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md b/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-Code-and-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md
deleted file mode 100644
index 612bd44..0000000
--- a/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-Code-and-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code).md
+++ /dev/null
@@ -1,11 +0,0 @@
-TBD - Should be pretty similar to the Windows CLI dev environment, but from a Mac.
-This page will be written in the near future.
-
-In the meantime, see:
-https://github.com/dotnet/eShopOnContainers/wiki/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code)
-
-
-
-## Sending feedback and pull requests
-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
\ No newline at end of file
diff --git a/05.-Setting-up-the-eShopOnContainers-solution-version-based-on-project.json-files-and-Visual-Studio-2015-environment.md b/05.-Setting-up-the-eShopOnContainers-solution-version-based-on-project.json-files-and-Visual-Studio-2015-environment.md
deleted file mode 100644
index e275296..0000000
--- a/05.-Setting-up-the-eShopOnContainers-solution-version-based-on-project.json-files-and-Visual-Studio-2015-environment.md
+++ /dev/null
@@ -1,134 +0,0 @@
-## Related branch in GitHub
-The related code for VS 2015 and project.json projects is the tagged VS215 version
-https://github.com/dotnet/eShopOnContainers/releases/tag/vs2015
-
-
-**IMPORTANT NOTE:** The tagged version supporting VS 2015 and project.json projects has been "deprecated" and even when it should work in VS 2015 and plain dotnet CLI and Docker CLI, this version will not get functional/features updates like the version for VS2017 and .CSPROJ projects that also works with the CLI.
-Basically, the eShopOnhContainers with project.json projects is deprecated code and won't be evolving anymore.
-
-## Development Environment Setup
-### Requirements for January 2016 version of eShopOnContainers
-
-WINDOWS DEV MACHINE
-- Visual Studio 2015 with latest Update
-- .NET Core 1.1 setup (Including ASP.NET Core and VS Tooling)
-- Bower and Gulp as global installs (See steps below)
-- Docker for Windows
-
-MAC DEV MACHINE
-- Visual Studio Code
-- .NET Core 1.1 for Mac - setup
-- Bower and Gulp as global installs (See steps below)
-- Docker for Mac
-
-### Installing and configuring Docker in your development machine
-
-#### Set needed assigned Memory and CPU to Docker
-In this application (January 2017 version) we run 1 instance of SQL Server running as a container with multiple databases (one DB per microservice), plus 6 ASP.NET Core apps/services and 1 Redis server, all of them running as Docker containers. So, especially because of SQL Server requirements on memory, it is important to set Docker up properly with enough memory RAM and CPU assigned to it or you will get difficult errors when starting the containers with "docker-compose up".
-Once Docker for Windows/Mac is installed in your machine, enter into its Settings and the Advanced menu option so you are able to adjust it to the minimum amount of memory and CPU (Memory: Around 4096MB and CPU:3) as shown in the image. Usually you might need a 16GB memory machine for this configuration if you also want to run the Android emulator for the Xamarin app at the same time. If you have a less powerful machine, you can try with a lower configuration and/or by not starting certain containers like the basket and Redis. But if you don't start all the containers, the application will not fully function properly, of course.
-
-
-
-#### Share drives in Docker settings (In order to deploy and debug with Visual Studio 2017)
-(Note, this is not required if running from Docker CLI with docker-compose up and using VS 2015 or any other IDE or Editor)
-In order to deploy/debug from Visual Studio 2017, you'll need to share the drives from Settings-> Shared Drives in the "Docker for Windows" configuration. -If you don't do this, you will get an error when trying to deploy/debug from VS 2017, like "Cannot create container for service yourApplication: C: drive is not shared".
-
-
-
-
-#### Node, Bower and Gulp installation
-(These steps about installing bower and gulp might not be needed anymore as these are being triggered from the project.json in the MVC project at the section 'prepublish":'). However, this will need to be migrated to .csproj when migrating to VS 2017.
-Before generating the Docker images, and specifically when generating the web apps binaries with "dotnet publish" from the custom scripts (like when running the build-images.ps1 script from PowerShell or the build-images.sh from bash in a Mac), it needs to have access to the paths where you have installed Bower and Gulp. For that, the recommendation is to install Bower and Gulp with a global installation by running the following commands from command-line or bash:
-- Install Node if you don't have it installed, from here: https://nodejs.org/en/
-
-- After you install Node, you need to align that installed version with the version used by Visual Studio, so you need to make sure that VS2017 is using the same nodejs that you are using from command line.
-**Go to "Tools -> Options -> Project and Solutions -> Web Package Management -> External Web Tools"** and ensure that the nodejs you use from command line is listed before the entry "$(VSINSTALLDIR)\Web\External"
-- Install Bower and Gulp with the following npm commands (npm is installed as part of Node)
-
- `npm install -g bower`
-
- `npm install -g gulp`
-
-Below you can see how those commands are run in Windows:
-
-
-
-## Build, Ship, Run
-In the global directory you will find the scripts needed to build, deploy and run the application into your local Docker development machine. The steps are the following:
-
-### Compile the .NET apps and Build the Docker images
-- Open a PowerShell window in Windows, move to the root folder of your solution and run the build-images.ps1 script file like in the following screenshot.
-
-IMPORTANT: This script deletes all the Docker images registered in your local dev machine repository before creating the new images, so it is starting from a 100% clean state. If you don't want your local images in your PC to be deleted, edit and change the build-images.ps1 script file before you run it.
-
-- This Power-Shell script that you will find in the root directory of the solution is responsible for building the .NET applications, copy the binaries in a pub folder and use Docker CLI commands to build the custom Docker images needed to run the containers. You can see how to run that PowerShell script in the screenshot below:
-
-
-- Once it finishes, you can check it out with Docker CLI if the images were generated correctly by typing in the PowerShell console the command: `docker images`
-
-Those Docker images are the ones you have available in your local image repository in your machine.
-You might have additional images, but at least, you should see the following list of images which are 6 custom images starting with the prefix "eshop" which is the name of the image repo. The rest of the images that are not starting with "eshop" will probably be official base-images like the microsoft/aspnetcore or the SQL Server for Linux images.
-
-### Deploy containers into your Docker host
-You can deploy Docker containers to a regularDocker host either by using the `docker run` command which need to be executed once per microservice, or by using the CLI tool `docker-compose up` which is very convenient for multi-container applications as it can spin-up all the multiple containers in your application with a single command. These are the steps:
-- Run your containers in your local host: Open your favorite command tool (PowerShell od CommandLine in Windows / Bash in Mac) and move to the root directory of the solution where the docker-compose.yml file is located and run the command `docker-compose up`. When running "docker-compose up" you should see something similar to the following screenshot in the PowerShell command window, although it will much longer than that, also showing many internal SQL commands from the services when populating the first time the sample data.
-`docker-compose up`
-
-
-- Note that the first time you run any container (with docker run or docker-compose) it detects that it needs the base images we are using, like the SQL Server image and the Redis image, so it will pull or download those base images from the Internet, from the public repo at the Docker registry named DOCKER HUB, by pulling the "microsoft/mssql-server-linux" which is the base image for the SQL Server for Linux on containers, and the "library/redis" which is the base Redis image. Therefore, the first time you run docker-compose it might take a few minutes pulling those images before it spins up your custom containers.
-The next time you run docker-compose up, since it'll have those base images already pulled/downloaded, it will just start the containers, like in the following screenshot:
-
-
-- Check out the containers running in your Docker host: Once docker-compose up finishes after a few minutes, you will have that PowerShell showing the execution's output in a "wait state", so in order to ask to Docker about "how it went" and see what containers are running, you need to open a second PowerShell window and type "docker ps" so you'll see all the running containers, as shown in the following screenshot.
-
-You can see the 6 custom containers running the microservices plus the 2 web applications. In adition you have the containers with the SQL databases and the Redis cache for the basket microservice data.
-
-
-#### IMPORTANT: Open ports in Firewall so Authentication to the STS (Security Token Service container) can be done through the 10.0.75.1 IP which should be available and already setup by Docker
-- You can manually create a rule in your local firewall in your development machine or you can also create that rule by just executing the add-firewall-docker.ps1 script in the solution's root.
-- Basically, you need to open the ports 5100 to 5105 that are used by the solution by creating an IN-BOUND RULE in your firewall, as shown in the screenshot below (for Windows).
-
-
-
-### Test the applications and microservices
-Once the deploy process of docker-compose finishes you should be able to access the services in the following URLs or connection string, from your dev machine:
-
-
-- Web MVC: http://localhost:5100
-- Web Spa: http://localhost:5104 (Important, check how to set up the SPA app and requirements before building the Docker images. Instructions at https://github.com/dotnet/eShopOnContainers/tree/master/src/Web/WebSPA/eShopOnContainers.WebSPA or the README.MD from eShopOnContainers/src/Web/WebSPA/eShopOnContainers.WebSPA)
-- Catalog microservice: http://localhost:5101 (Not secured)
-- Ordering microservice: http://localhost:5102 (Requires token for authorization)
-- Basket microservice: http://localhost:5103 (Requires token for authorization)
-- Identity microservice: http://localhost:5105
-- Orders database (SQL Server connection string): Server=tcp:localhost,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
-- Catalog database (SQL Server connection string): Server=tcp:localhost,5434;Database=CatalogDB;User Id=sa;Password=Pass@word
-- ASP.NET Identity database (SQL Server connection string): Server=localhost,5433;Database=aspnet-Microsoft.eShopOnContainers;User Id=sa;Password=Pass@word
-- Basket data (Redis): listening at localhost:6379
-
-#### Trying the Web MVC application with the DemoUser@microsoft.com user account
-When you try the Web MVC application by using the url http://localhost:5100, you'll be able to test the home page which is also the catalog page. But when trying to add any article to the basket you will get redirected to the login page which is handled by the STS microservice (Security Token Service). At this point, you could register your own user/customer or you can also use a convenient default user/customer named DemoUser@microsoft.com so you don't need to register your own user and it'll be easier to test.
-The credentials for this demo user are:
-- User: demouser@microsoft.com
-- Password: Pass@word1
-
-Below you can see the login page when providing those credentials.
-
-
-#### Trying the Xamarin.Forms mobile apps for Android, iOS and Windows
-By default, this app shows fake data from mock-services. In order to really access the microservices/containers in Docker from the mobile app, you need to:
- - Disable mock-services in the Xamarin app by setting the UseMockServices = false in the App.xaml.cs and specify the host IP in BaseEndpoint = "http://10.106.144.28" at the GlobalSettings.cs. Both files in the Xamarin.Forms project (PCL).
- - Another alternative is to change that IP through the app UI, by modifying the IP address in the Settings page of the App as shown in the screenshot below.
-- In addition, you need to make sure that the used TCP ports of the services are open in the local firewall.
-
-
-### Deploying individiual services into Docker
-Under each project root you will find a readme.md file which describes how to run and deploy the service individually into a docker host.
-
-> ### Note on Windows Containers
-> As mentioned, the development and testing of this project (January 2017 version) was done on Docker Linux containers running in development machines with "Docker for Windows" and the default Hyper-V Linux VM (MobiLinuxVM) installed by "Docker for Windows".
-In order to run the application on Windows Containers you'd need to change the base images used by each container:
-> - Official .NET Core base-image for Windows Containers, at Docker Hub: https://hub.docker.com/r/microsoft/dotnet/ (Using the Windows Nanoserver tag)
-> - Official base-image for SQL Server on Windows Containers, at Docker Hub: https://hub.docker.com/r/microsoft/mssql-server-windows
-
-
diff --git a/06.-Setting-the-Web-SPA-application-up.md b/06.-Setting-the-Web-SPA-application-up.md
deleted file mode 100644
index 45fb3ad..0000000
--- a/06.-Setting-the-Web-SPA-application-up.md
+++ /dev/null
@@ -1,67 +0,0 @@
-The Web SPA application needs a few additional steps to make it work due to its JavaScript frameworks dependencies and JS code to be built before generating the Docker Images.
-
-## Requirements and set up
-
-
-### Install NPM
-In order to be able to build the JavaScript dependencies from command line by using npm you need to install npm globally.
-
-NPM is bundled with NODE.JS. Installing NPM and NODE is pretty straightforward by using the installer package available at https://nodejs.org/en/
-
-
-You can install the version "Recommended For Most Users" of Node which at the moment of this writing was v6.10.0 LTS.
-You can see the installed NPM version with the command npm -v, as shown below.
-
-
-
-### Set NPM path into Visual Studio
-This step is only required if you are also using the full Visual Studio 2017.
-NPM (just instelled by you) will be usually installed under this path:
-C:\Program Files\nodejs.
-You need to update that path in Visual Studio under the "External Web Tools" location paths, as shown below:
-
-
-If you don't do this step you might have issues because of using different versions from VS versus the command line accessing the same JavaScript code from both environments.
-See:
-http://www.hanselman.com/blog/VisualStudio2015FixingDependenciesNpmNotInstalledFromFseventsWithNodeOnWindows.aspx
-
-
-### Build the SPA app with NPM
-Now, you need to build the SPA app (TypeScript and Angular 2 based client app) with NPM.
-* Open a command-prompt window and move to the root of the SPA application (src\Web\WebSPA\eShopOnContainers.WebSPA)
-* Run the command npm install as shown below:
-
-* Then, run the command npm run build:prod as shown below:
-
-
- If you get an error like "Node Sass could not find a binding for your current environment: Windows 64-bit with Node.js 6.x", then run the command npm rebuild node-sass as in the following screenshot:
-
- Then, run again the npm run build:prod command that should finish with no errors.
-
-
-
-#### (Optional) Run NPM tasks from within Visual Studio 2017
-
-As the chosen workload method when developing a client frontend app (JS frameworks, etc.), the developer has to be able to trigger the npm tasks when he wants.
-Of course, he can always open a command propmt and run npm from the CLI as you just did in the steps above (which is most front-end devs do, in fact).
-However, you can also run npm tasks inside Visual Studio if you install the following VS extension: https://marketplace.visualstudio.com/items?itemName=MadsKristensen.NPMTaskRunner
-
-This extension adds to the "Task Runner Explorer" the capabailities to run npm tasks (since, out of the box, only gulp/grunt tasks are supported by VS2017). After this extension is installed you can run npm tasks from inside VS2017 and also set build bindings if you wanted.
-
-
-
-This extension honors the VS External Web Tools configuration, and allows you to use bindings, so if you want to run npm tasks automatically on every VS build, you could do so. This is not set as default in the eShopOnContainers provided code as it would slow down each VS build with the npm build tasks.
-
-### Build the Docker images and Deploy the containers
-At this point, if you were originally following the eShopOnContainer setup for any environment and came to this page just to setup the SPA app, now go back to your original setup instructions page. Other than that, you can in any case choose between any of the following options to build and deploy the Docker containers:
-
-1. **VS 2017 based:** Build and deploy in a single step from Visual Studio 2017 as explained in this page: https://github.com/dotnet/eShopOnContainers/wiki/02.-Setting-eShopOnContainer-solution-up-in-a-Visual-Studio-2017-environment
-
-2. **CLI on Windows:** Build the .NET bits with the build-container based on dontnet CLI and Docker CLI, as explained in this page: https://github.com/dotnet/eShopOnContainers/wiki/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code)
-
-3. **CLI on Mac:** Build the .NET bits with the build-container based on dontnet CLI and Docker CLI, as explained in this page: https://github.com/dotnet/eShopOnContainers/wiki/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-Code-and-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code)
-
-
-## Sending feedback and pull requests
-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
\ No newline at end of file
diff --git a/07.-Setting-up-the-Xamarin-mobile-apps.md b/07.-Setting-up-the-Xamarin-mobile-apps.md
deleted file mode 100644
index ae7be7e..0000000
--- a/07.-Setting-up-the-Xamarin-mobile-apps.md
+++ /dev/null
@@ -1,6 +0,0 @@
-To be implemented soon.
-
-
-## Sending feedback and pull requests
-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
\ No newline at end of file
diff --git "a/08.-Deploying-\"Production-Staging\"-config-for-remote-browsers-or-Xamarin-mobile-apps-(Using-external-DNS-name-or--external-IP-instead-of-LOCALHOST).md" "b/08.-Deploying-\"Production-Staging\"-config-for-remote-browsers-or-Xamarin-mobile-apps-(Using-external-DNS-name-or--external-IP-instead-of-LOCALHOST).md"
deleted file mode 100644
index 8d45b4d..0000000
--- "a/08.-Deploying-\"Production-Staging\"-config-for-remote-browsers-or-Xamarin-mobile-apps-(Using-external-DNS-name-or--external-IP-instead-of-LOCALHOST).md"
+++ /dev/null
@@ -1,12 +0,0 @@
-DRAFT - TBD in further details.
-Basically, the docker-compose needs to be using the "production/staging" config, with:
-
-**docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d**
-
-This is using the [docker-compose.prod.yml](https://github.com/dotnet/eShopOnContainers/blob/master/docker-compose.prod.yml) which is providing an specific external DNS or IP configured by default at the [.env file](https://github.com/dotnet/eShopOnContainers/blob/master/.env) as:
-
-ESHOP_EXTERNAL_DNS_NAME_OR_IP=192.168.88.248
-
-You could override with values from environment variables from your runtime/shell, as well.
-
-
diff --git a/Home.md b/Home.md
deleted file mode 100644
index 762bb80..0000000
--- a/Home.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Welcome to the eShopOnContainers wiki!
-
-## Questions
-[QUESTION] Answer +1 if the solution is working for you (Through VS2017 or CLI environment):
-https://github.com/dotnet/eShopOnContainers/issues/107
-
-## Roadmap
-https://github.com/dotnet/eShopOnContainers/wiki/01.-Roadmap-and-Milestones-for-future-releases
-
-## Setting up your development environment for eShopOnContainers
-### Visual Studio 2017 and Windows based
-This is the more straightforward way to get started:
-https://github.com/dotnet/eShopOnContainers/wiki/02.-Setting-eShopOnContainer-solution-up-in-a-Visual-Studio-2017-environment
-
-### CLI and Windows based
-For those who prefer the CLI on Windows, using dotnet CLI, docker CLI and VS Code for Windows:
-https://github.com/dotnet/eShopOnContainers/wiki/03.-Setting-the-eShopOnContainers-solution-up-in-a-Windows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code)
-
-### CLI and Mac based
-For those who prefer the CLI on a Mac, using dotnet CLI, docker CLI and VS Code for Mac:
-https://github.com/dotnet/eShopOnContainers/wiki/04.-Setting-eShopOnContainer-solution-up-in-a-Mac,-VS-Code-and-CLI-environment--(dotnet-CLI,-Docker-CLI-and-VS-Code)
-
-## Related Documentation
-### Guide/eBook: Architecting and Developing Containerized and Microservice based .NET Applications
-https://github.com/dotnet/eShopOnContainers/blob/master/docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
-
-##Issues:
-https://github.com/dotnet/eShopOnContainers/issues
-
-## Sending feedback and pull requests
-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
\ No newline at end of file
diff --git a/img/Bower_and_Gulp_setup.png b/img/Bower_and_Gulp_setup.png
deleted file mode 100644
index 78470a4..0000000
Binary files a/img/Bower_and_Gulp_setup.png and /dev/null differ
diff --git a/img/Generating_Docker_Images.png b/img/Generating_Docker_Images.png
deleted file mode 100644
index a255415..0000000
Binary files a/img/Generating_Docker_Images.png and /dev/null differ
diff --git a/img/Multiple-Distributed-Dependencies.png b/img/Multiple-Distributed-Dependencies.png
deleted file mode 100644
index c06f7b5..0000000
Binary files a/img/Multiple-Distributed-Dependencies.png and /dev/null differ
diff --git a/img/Node_setup_for_npm.png b/img/Node_setup_for_npm.png
deleted file mode 100644
index 6332950..0000000
Binary files a/img/Node_setup_for_npm.png and /dev/null differ
diff --git a/img/cli-windows/build-bits-1.png b/img/cli-windows/build-bits-1.png
deleted file mode 100644
index 28689c5..0000000
Binary files a/img/cli-windows/build-bits-1.png and /dev/null differ
diff --git a/img/cli-windows/build-bits-2.png b/img/cli-windows/build-bits-2.png
deleted file mode 100644
index d1261d7..0000000
Binary files a/img/cli-windows/build-bits-2.png and /dev/null differ
diff --git a/img/cli-windows/build-bits-3-catalog-bits.png b/img/cli-windows/build-bits-3-catalog-bits.png
deleted file mode 100644
index e637696..0000000
Binary files a/img/cli-windows/build-bits-3-catalog-bits.png and /dev/null differ
diff --git a/img/cli-windows/cd-to-root-folder.png b/img/cli-windows/cd-to-root-folder.png
deleted file mode 100644
index 97b0926..0000000
Binary files a/img/cli-windows/cd-to-root-folder.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-ci-compose-file-ending.png b/img/cli-windows/docker-compose-ci-compose-file-ending.png
deleted file mode 100644
index 1ed7791..0000000
Binary files a/img/cli-windows/docker-compose-ci-compose-file-ending.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-ci-compose-file.png b/img/cli-windows/docker-compose-ci-compose-file.png
deleted file mode 100644
index 9ef7337..0000000
Binary files a/img/cli-windows/docker-compose-ci-compose-file.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-pulling-aspnetbuild-image.png b/img/cli-windows/docker-compose-pulling-aspnetbuild-image.png
deleted file mode 100644
index 5d939d0..0000000
Binary files a/img/cli-windows/docker-compose-pulling-aspnetbuild-image.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-up-0-initial-pull-images.png b/img/cli-windows/docker-compose-up-0-initial-pull-images.png
deleted file mode 100644
index 56b6fc9..0000000
Binary files a/img/cli-windows/docker-compose-up-0-initial-pull-images.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-up-1.1.png b/img/cli-windows/docker-compose-up-1.1.png
deleted file mode 100644
index 0a2b7bc..0000000
Binary files a/img/cli-windows/docker-compose-up-1.1.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-up-1.2.png b/img/cli-windows/docker-compose-up-1.2.png
deleted file mode 100644
index 08bfa51..0000000
Binary files a/img/cli-windows/docker-compose-up-1.2.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-up-1.png b/img/cli-windows/docker-compose-up-1.png
deleted file mode 100644
index 649719c..0000000
Binary files a/img/cli-windows/docker-compose-up-1.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-up-2.png b/img/cli-windows/docker-compose-up-2.png
deleted file mode 100644
index fb086d2..0000000
Binary files a/img/cli-windows/docker-compose-up-2.png and /dev/null differ
diff --git a/img/cli-windows/docker-compose-up-ending-wait.png b/img/cli-windows/docker-compose-up-ending-wait.png
deleted file mode 100644
index 6742e7b..0000000
Binary files a/img/cli-windows/docker-compose-up-ending-wait.png and /dev/null differ
diff --git a/img/cli-windows/docker-ps-with-all-microservices.png b/img/cli-windows/docker-ps-with-all-microservices.png
deleted file mode 100644
index ad9757a..0000000
Binary files a/img/cli-windows/docker-ps-with-all-microservices.png and /dev/null differ
diff --git a/img/cli-windows/git-clone-powershell.png b/img/cli-windows/git-clone-powershell.png
deleted file mode 100644
index fa63d9b..0000000
Binary files a/img/cli-windows/git-clone-powershell.png and /dev/null differ
diff --git a/img/cli-windows/list-of-images.png b/img/cli-windows/list-of-images.png
deleted file mode 100644
index 1937f1b..0000000
Binary files a/img/cli-windows/list-of-images.png and /dev/null differ
diff --git a/img/cli-windows/powershell-set-execution-policy.png b/img/cli-windows/powershell-set-execution-policy.png
deleted file mode 100644
index b1aa25b..0000000
Binary files a/img/cli-windows/powershell-set-execution-policy.png and /dev/null differ
diff --git a/img/cli-windows/vs-code-1.png b/img/cli-windows/vs-code-1.png
deleted file mode 100644
index 62f661f..0000000
Binary files a/img/cli-windows/vs-code-1.png and /dev/null differ
diff --git a/img/cli-windows/vs-code-2.png b/img/cli-windows/vs-code-2.png
deleted file mode 100644
index ff93b7e..0000000
Binary files a/img/cli-windows/vs-code-2.png and /dev/null differ
diff --git a/img/cli-windows/vs-code-3-extensions.png b/img/cli-windows/vs-code-3-extensions.png
deleted file mode 100644
index e5d6773..0000000
Binary files a/img/cli-windows/vs-code-3-extensions.png and /dev/null differ
diff --git a/img/docker-compose-up-1.png b/img/docker-compose-up-1.png
deleted file mode 100644
index 6aa3b1c..0000000
Binary files a/img/docker-compose-up-1.png and /dev/null differ
diff --git a/img/docker-compose-up-2.png b/img/docker-compose-up-2.png
deleted file mode 100644
index 705d839..0000000
Binary files a/img/docker-compose-up-2.png and /dev/null differ
diff --git a/img/docker-ps-with-all-microservices.png b/img/docker-ps-with-all-microservices.png
deleted file mode 100644
index b803ab3..0000000
Binary files a/img/docker-ps-with-all-microservices.png and /dev/null differ
diff --git a/img/docker_settings.png b/img/docker_settings.png
deleted file mode 100644
index b2641c7..0000000
Binary files a/img/docker_settings.png and /dev/null differ
diff --git a/img/docker_settings_shared_drives.png b/img/docker_settings_shared_drives.png
deleted file mode 100644
index 1027a43..0000000
Binary files a/img/docker_settings_shared_drives.png and /dev/null differ
diff --git a/img/eShopOnContainers_Architecture_Diagram.png b/img/eShopOnContainers_Architecture_Diagram.png
deleted file mode 100644
index 5a45657..0000000
Binary files a/img/eShopOnContainers_Architecture_Diagram.png and /dev/null differ
diff --git a/img/ebook_arch_dev_microservices_containers_cover.png b/img/ebook_arch_dev_microservices_containers_cover.png
deleted file mode 100644
index 2a959ac..0000000
Binary files a/img/ebook_arch_dev_microservices_containers_cover.png and /dev/null differ
diff --git a/img/ebook_containers_lifecycle.png b/img/ebook_containers_lifecycle.png
deleted file mode 100644
index 650703a..0000000
Binary files a/img/ebook_containers_lifecycle.png and /dev/null differ
diff --git a/img/eshop-webmvc-app-screenshot.png b/img/eshop-webmvc-app-screenshot.png
deleted file mode 100644
index 0c02fe8..0000000
Binary files a/img/eshop-webmvc-app-screenshot.png and /dev/null differ
diff --git a/img/eshop-webspa-app-screenshot.png b/img/eshop-webspa-app-screenshot.png
deleted file mode 100644
index 854c5e8..0000000
Binary files a/img/eshop-webspa-app-screenshot.png and /dev/null differ
diff --git a/img/eshop_cover.png b/img/eshop_cover.png
deleted file mode 100644
index 5e2f01b..0000000
Binary files a/img/eshop_cover.png and /dev/null differ
diff --git a/img/eshop_logo.png b/img/eshop_logo.png
deleted file mode 100644
index ecbcd25..0000000
Binary files a/img/eshop_logo.png and /dev/null differ
diff --git a/img/firewall-rule-for-eshop.png b/img/firewall-rule-for-eshop.png
deleted file mode 100644
index 996b632..0000000
Binary files a/img/firewall-rule-for-eshop.png and /dev/null differ
diff --git a/img/list-of-images.png b/img/list-of-images.png
deleted file mode 100644
index 3985db2..0000000
Binary files a/img/list-of-images.png and /dev/null differ
diff --git a/img/login-demo-user.png b/img/login-demo-user.png
deleted file mode 100644
index d5d9cf6..0000000
Binary files a/img/login-demo-user.png and /dev/null differ
diff --git a/img/netcore-sdk-11-installer.png b/img/netcore-sdk-11-installer.png
deleted file mode 100644
index 559c6a4..0000000
Binary files a/img/netcore-sdk-11-installer.png and /dev/null differ
diff --git a/img/spa/installing_npm_node.png b/img/spa/installing_npm_node.png
deleted file mode 100644
index b800022..0000000
Binary files a/img/spa/installing_npm_node.png and /dev/null differ
diff --git a/img/spa/npm-install.png b/img/spa/npm-install.png
deleted file mode 100644
index 113713a..0000000
Binary files a/img/spa/npm-install.png and /dev/null differ
diff --git a/img/spa/npm-install_full.png b/img/spa/npm-install_full.png
deleted file mode 100644
index 2a3f92d..0000000
Binary files a/img/spa/npm-install_full.png and /dev/null differ
diff --git a/img/spa/npm-rebuild-node-sass.png b/img/spa/npm-rebuild-node-sass.png
deleted file mode 100644
index 309ba51..0000000
Binary files a/img/spa/npm-rebuild-node-sass.png and /dev/null differ
diff --git a/img/spa/npm-run-build-prod-no-errors.png b/img/spa/npm-run-build-prod-no-errors.png
deleted file mode 100644
index 31cc9ee..0000000
Binary files a/img/spa/npm-run-build-prod-no-errors.png and /dev/null differ
diff --git a/img/spa/npm-run-build-prod.png b/img/spa/npm-run-build-prod.png
deleted file mode 100644
index 3aede95..0000000
Binary files a/img/spa/npm-run-build-prod.png and /dev/null differ
diff --git a/img/spa/npm-run-build.png b/img/spa/npm-run-build.png
deleted file mode 100644
index 839ad8d..0000000
Binary files a/img/spa/npm-run-build.png and /dev/null differ
diff --git a/img/spa/npm-versions-powershell.png b/img/spa/npm-versions-powershell.png
deleted file mode 100644
index baf7410..0000000
Binary files a/img/spa/npm-versions-powershell.png and /dev/null differ
diff --git a/img/spa/task-runner-with-npm-extension.png b/img/spa/task-runner-with-npm-extension.png
deleted file mode 100644
index d04a6ea..0000000
Binary files a/img/spa/task-runner-with-npm-extension.png and /dev/null differ
diff --git a/img/spa/vs-tools-path-custom-node.png b/img/spa/vs-tools-path-custom-node.png
deleted file mode 100644
index dbe9708..0000000
Binary files a/img/spa/vs-tools-path-custom-node.png and /dev/null differ
diff --git a/img/spa/vs-tools-path-original.png b/img/spa/vs-tools-path-original.png
deleted file mode 100644
index 66fde95..0000000
Binary files a/img/spa/vs-tools-path-original.png and /dev/null differ
diff --git a/img/swagger-catalog-1.png b/img/swagger-catalog-1.png
deleted file mode 100644
index 03538dc..0000000
Binary files a/img/swagger-catalog-1.png and /dev/null differ
diff --git a/img/swagger-catalog-2.png b/img/swagger-catalog-2.png
deleted file mode 100644
index ff30a37..0000000
Binary files a/img/swagger-catalog-2.png and /dev/null differ
diff --git a/img/vs-solution-structure.png b/img/vs-solution-structure.png
deleted file mode 100644
index 76b4edd..0000000
Binary files a/img/vs-solution-structure.png and /dev/null differ
diff --git a/img/vs2017/debug-F5-button.png b/img/vs2017/debug-F5-button.png
deleted file mode 100644
index f6593e7..0000000
Binary files a/img/vs2017/debug-F5-button.png and /dev/null differ
diff --git a/img/vs2017/debugging-mvc-app.png b/img/vs2017/debugging-mvc-app.png
deleted file mode 100644
index e8bd2de..0000000
Binary files a/img/vs2017/debugging-mvc-app.png and /dev/null differ
diff --git a/img/vs2017/debugging-webapi-microservice.png b/img/vs2017/debugging-webapi-microservice.png
deleted file mode 100644
index 95c7ab2..0000000
Binary files a/img/vs2017/debugging-webapi-microservice.png and /dev/null differ
diff --git a/img/vs2017/docker-compose-properties.png b/img/vs2017/docker-compose-properties.png
deleted file mode 100644
index fa1291f..0000000
Binary files a/img/vs2017/docker-compose-properties.png and /dev/null differ
diff --git a/img/vs2017/docker-ps.png b/img/vs2017/docker-ps.png
deleted file mode 100644
index 859c3e9..0000000
Binary files a/img/vs2017/docker-ps.png and /dev/null differ
diff --git a/img/vs2017/github-clone-branch.png b/img/vs2017/github-clone-branch.png
deleted file mode 100644
index 100f20a..0000000
Binary files a/img/vs2017/github-clone-branch.png and /dev/null differ
diff --git a/img/vs2017/set-docker-node-as-default.png b/img/vs2017/set-docker-node-as-default.png
deleted file mode 100644
index b009d34..0000000
Binary files a/img/vs2017/set-docker-node-as-default.png and /dev/null differ
diff --git a/img/vs2017/vs-2017-eshoponcontainers-servicesandwebapps-solution.png b/img/vs2017/vs-2017-eshoponcontainers-servicesandwebapps-solution.png
deleted file mode 100644
index 653c082..0000000
Binary files a/img/vs2017/vs-2017-eshoponcontainers-servicesandwebapps-solution.png and /dev/null differ
diff --git a/img/vs2017/vs2017-f5-with-eshoponcontainers-web-mvc-in-browser.png b/img/vs2017/vs2017-f5-with-eshoponcontainers-web-mvc-in-browser.png
deleted file mode 100644
index 9d8de28..0000000
Binary files a/img/vs2017/vs2017-f5-with-eshoponcontainers-web-mvc-in-browser.png and /dev/null differ
diff --git a/img/vs2017/vs2017_additional_mobile_workloads.png b/img/vs2017/vs2017_additional_mobile_workloads.png
deleted file mode 100644
index 077ffa4..0000000
Binary files a/img/vs2017/vs2017_additional_mobile_workloads.png and /dev/null differ
diff --git a/img/vs2017/vs2017_server_workload.png b/img/vs2017/vs2017_server_workload.png
deleted file mode 100644
index 5e2bb4e..0000000
Binary files a/img/vs2017/vs2017_server_workload.png and /dev/null differ
diff --git a/img/vs2017/xamarin-workload-options.png b/img/vs2017/xamarin-workload-options.png
deleted file mode 100644
index 31a8dea..0000000
Binary files a/img/vs2017/xamarin-workload-options.png and /dev/null differ
diff --git a/img/xamarin-mobile-App.png b/img/xamarin-mobile-App.png
deleted file mode 100644
index 7b63a48..0000000
Binary files a/img/xamarin-mobile-App.png and /dev/null differ
diff --git a/img/xamarin-settings.png b/img/xamarin-settings.png
deleted file mode 100644
index 4379091..0000000
Binary files a/img/xamarin-settings.png and /dev/null differ
diff --git a/img/xamarin/fix-hyperv-for-issue-xamarin-app-minimize-in-vs-android-emulator.png b/img/xamarin/fix-hyperv-for-issue-xamarin-app-minimize-in-vs-android-emulator.png
deleted file mode 100644
index a4d0a3f..0000000
Binary files a/img/xamarin/fix-hyperv-for-issue-xamarin-app-minimize-in-vs-android-emulator.png and /dev/null differ