From da2aefaef25857539c14edd32fd3592f85298168 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 20 Feb 2017 21:13:15 -0800 Subject: [PATCH 1/6] Updated 02. Setting eShopOnContainer solution up in a Visual Studio 2017 environment (markdown) --- ...tainer-solution-up-in-a-Visual-Studio-2017-environment.md | 5 +++++ 1 file changed, 5 insertions(+) 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 index 6494fdf..9519ac0 100644 --- 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 @@ -1,5 +1,10 @@ ## Setting eShopOnContainers up in a Visual Studio 2017 development machine +### GitHub branch to use +As of February 20th, the branch to use with VS 2017 (.CSPROJ support) is: **vs2017 **: +https://github.com/dotnet/eShopOnContainers/tree/vs2017 + +### 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. From abd4e4d19415dc4fe275e94a99170bbd97caa1ba Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 20 Feb 2017 21:13:58 -0800 Subject: [PATCH 2/6] Updated 02. Setting eShopOnContainer solution up in a Visual Studio 2017 environment (markdown) --- ...Container-solution-up-in-a-Visual-Studio-2017-environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 9519ac0..e4a182a 100644 --- 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 @@ -1,7 +1,7 @@ ## Setting eShopOnContainers up in a Visual Studio 2017 development machine ### GitHub branch to use -As of February 20th, the branch to use with VS 2017 (.CSPROJ support) is: **vs2017 **: +As of February 20th, the branch to use with VS 2017 (.CSPROJ support) is the branch: vs2017 : https://github.com/dotnet/eShopOnContainers/tree/vs2017 ### Software requirements From f47dffc69c1c2b388bb3cf09ff4fb70cf7fa5234 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 20 Feb 2017 21:16:08 -0800 Subject: [PATCH 3/6] Updated 03. Setting the eShopOnContainers solution up in a Windows CLI environment (dotnet CLI, Docker CLI and VS Code) (markdown) --- ...-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md | 6 ++++++ 1 file changed, 6 insertions(+) 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 index 7a0ba54..477cc77 100644 --- 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 @@ -1,5 +1,11 @@ ## Setting eShopOnContainers up in a CLI and Windows based development machine +### GitHub branch to use +As of February 20th, the branch to use with .NET and Docker CLI with .CSPROJ projects support is the branch: vs2017 : +https://github.com/dotnet/eShopOnContainers/tree/vs2017 +(It is the same code than used with VS 2017) + +### 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 From 5adb4a437b99973d9249098bf74c371d97458002 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 20 Feb 2017 21:17:20 -0800 Subject: [PATCH 4/6] Updated 03. Setting the eShopOnContainers solution up in a Windows CLI environment (dotnet CLI, Docker CLI and VS Code) (markdown) --- ...dows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 477cc77..3b15477 100644 --- 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 @@ -1,7 +1,7 @@ ## Setting eShopOnContainers up in a CLI and Windows based development machine ### GitHub branch to use -As of February 20th, the branch to use with .NET and Docker CLI with .CSPROJ projects support is the branch: vs2017 : +As of February 20th, the branch to use with .NET Core CLI and Docker CLI with .CSPROJ projects support is the branch: vs2017 : https://github.com/dotnet/eShopOnContainers/tree/vs2017 (It is the same code than used with VS 2017) From 7fab253aeae603f5793c7d300ce54a4035e990fb Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Mon, 20 Feb 2017 21:38:10 -0800 Subject: [PATCH 5/6] Updated 03. Setting the eShopOnContainers solution up in a Windows CLI environment (dotnet CLI, Docker CLI and VS Code) (markdown) --- ...dows-CLI-environment-(dotnet-CLI,-Docker-CLI-and-VS-Code).md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 3b15477..d26d99f 100644 --- 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 @@ -115,7 +115,7 @@ These steps are easily performed by running a convenient script already created -### Buil Images and Deploy containers into your Docker host +### 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: From 7b3762f158326b0b9edc93d05a731e839f67e7ad Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Date: Tue, 21 Feb 2017 10:50:47 -0800 Subject: [PATCH 6/6] Updated Home (markdown) --- Home.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Home.md b/Home.md index bdc82c9..daca49a 100644 --- a/Home.md +++ b/Home.md @@ -1,7 +1,7 @@ # Welcome to the eShopOnContainers wiki! ## Roadmap -https://github.com/dotnet/eShopOnContainers/wiki/Roadmap-and-Milestones-for-future-releases +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