Merge branch 'master' into Review-Snippet-References-XML-3

Author: tompratt-AQ

.openpublishing.redirection.json

@@ -212,7 +212,7 @@
         },
         {
             "source_path": "docs/core/tutorials/libraries-with-vs.md", 
-            "redirect_url": "/dotnet/articles/csharp/getting-started/library-with-visual-studio-2017"
+            "redirect_url": "/dotnet/articles/csharp/getting-started/library-with-visual-studio"
         },               
         {
             "source_path": "docs/core/tutorials/target-dotnetcore-with-msbuild.md",
@@ -245,16 +245,22 @@
             "redirect_url": "https://msdn.microsoft.com/library/hh678682(v=vs.120)"
         },
         {
-            "source_path": "docs/csharp/getting-started/debugging-with-visual-studio.md", 
-            "redirect_url": "/dotnet/articles/csharp/getting-started/debugging-with-visual-studio-2017"
-        },        
+            "source_path": "docs/csharp/getting-started/consuming-library-with-visual-studio-2017.md", 
+            "redirect_url": "/dotnet/articles/getting-started/consuming-library-with-visual-studio",
+            "redirect_document_id": true
+        },
         {
-            "source_path": "docs/csharp/getting-started/library-with-visual-studio_2017.md",
-            "redirect_url": "/dotnet/articles/csharp/getting-started/library-with-visual-studio-2017"
+            "source_path": "docs/csharp/getting-started/debugging-with-visual-studio-2017.md", 
+            "redirect_url": "/dotnet/articles/csharp/getting-started/debugging-with-visual-studio"
         },
         {
-            "source_path": "docs/csharp/getting-started/publishing-with-visual-studio.md", 
-            "redirect_url": "/dotnet/articles/csharp/getting-started/publishing-with-visual-studio-2017"
+            "source_path": "docs/csharp/getting-started/library-with-visual-studio-2017.md", 
+            "redirect_url": "/dotnet/articles/getting-started/library-with-visual-studio",
+            "redirect_document_id": true
+        },     
+        {
+            "source_path": "docs/csharp/getting-started/publishing-with-visual-studio-2017.md", 
+            "redirect_url": "/dotnet/articles/csharp/getting-started/publishing-with-visual-studio"
         },        
         {
             "source_path": "docs/csharp/getting-started/whats-new.md",
@@ -267,19 +273,19 @@
         },
         {
             "source_path": "docs/csharp/interactive.md", 
-            "redirect_url": "/dotnet/articles/csharp/interactive/"
+            "redirect_url": "/dotnet/articles/csharp/index"
         },        
         {
             "source_path": "docs/csharp/interactive-with-bash.md", 
-            "redirect_url": "/dotnet/articles/csharp/interactive/with-bash"
+            "redirect_url": "/dotnet/articles/csharp/index"
         },
         {
             "source_path": "docs/csharp/interactive-with-powershell.md", 
-            "redirect_url": "/dotnet/articles/csharp/interactive/with-powershell"
+            "redirect_url": "/dotnet/articles/csharp/index"
         },
         {
             "source_path": "docs/csharp/interactive-with-visualstudio.md", 
-            "redirect_url": "/dotnet/articles/csharp/interactive/with-visualstudio"
+            "redirect_url": "/dotnet/articles/csharp/index"
         },
         {
             "source_path": "docs/csharp/interfaces.md", 
@@ -708,6 +714,10 @@
         {
             "source_path": "docs/visual-basic/developing-apps/using-ide/using-the-visual-basic-development-environment.md",
             "redirect_url": "/visualstudio/ide/visual-studio-ide"
+        },
+        {
+            "source_path": "docs/visual-basic/getting-started/breaking-changes-in-visual-studio-2015.md", 
+            "redirect_url": "/dotnet/articles/visual-basic/getting-started/breaking-changes-in-visual-studio"
         }
     ]
 }

docfx.json

@@ -1,5 +1,6 @@
 {
   "build": {
+    "markdownEngineName": "dfm-latest",
     "content": [
       {
         "files": [
@@ -117,4 +118,4 @@
     ],
     "lruSize": 0
   }
-}
+}

docs/core/docker/visual-studio-tools-for-docker.md

@@ -1,36 +1,35 @@
 ---
 title: Visual Studio Tools for Docker
 description: Using Visual Studio Tools for Docker 
-keywords: .NET, .NET Core, Docker, ASP.NET Core, Visual Studio 2015
+keywords: .NET, .NET Core, Docker, ASP.NET Core, Visual Studio
 author: spboyer
 ms.author: shboyer
-ms.date: 09/16/2016
+ms.date: 04/27/2017
 ms.topic: article
 ms.prod: .net-core
 ms.technology: dotnet-docker
 ms.devlang: dotnet
 ms.assetid: 1f3b9a68-4dea-4b60-8cb3-f46164eedbbf
 ---
 
-# Visual Studio Tools for Docker 
-Developing and debugging your application in a Docker container can be a ceremony of tasks to get setup with various tools. [Visual Studio Tools for Docker](https://visualstudiogallery.msdn.microsoft.com/0f5b2caa-ea00-41c8-b8a2-058c7da0b3e4) helps you get past the hurdles and find the bugs using F5 to debug your application directly in a locally hosted Docker Container. 
+# Visual Studio Tools for Docker
 
-> [!NOTE]
->The current version targets Linux Docker containers, with Windows Containers coming soon.
+[Microsoft Visual Studio 2017](https://www.visualstudio.com/) with [Docker for Windows](https://docs.docker.com/docker-for-windows/install/) supports building, debugging, and running .NET Framework and .NET Core web and console applications using Windows and Linux containers.
 
 ## Prerequisites
-- [Microsoft Visual Studio 2015 Update 3](https://www.visualstudio.com/downloads/download-visual-studio-vs)
-- [.NET Core 1.0.1 - VS 2015 Tooling Preview 2](https://go.microsoft.com/fwlink/?LinkID=827546)
-- [Docker For Windows](https://www.docker.com/products/docker#/windows) to run your Docker containers locally
+
+- [Microsoft Visual Studio 2017](https://www.visualstudio.com/)
+- [Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
 
 ## Installation and setup
-Download and install the [Visual Studio Tools for Docker](https://aka.ms/DockerToolsForVS) from the [Visual Studio Gallery](http://visualstudiogallery.msdn.microsoft.com/) or you can search for it in **Extensions and Updates** within Visual Studio. 
 
-A required configuration is to setup **[Shared Drives](https://docs.docker.com/docker-for-windows/#/shared-drives)** in Docker for Windows. The setting is required for the volume mapping and debugging support.
+Install [Microsoft Visual Studio 2017](https://www.visualstudio.com/) with the .NET Core workload. Review the information at [Docker for Windows: What to know before you install](https://docs.docker.com/docker-for-windows/install/#what-to-know-before-you-install) and install [Docker For Windows](https://docs.docker.com/docker-for-windows/install/).
+
+A required configuration is to setup **[Shared Drives](https://docs.docker.com/docker-for-windows/#shared-drives)** in Docker for Windows. The setting is required for the volume mapping and debugging support.
 
 Right click the Docker icon in the System Tray, click Settings and select Shared Drives.
 
-![Shared Drives](./media/visual-studio-tools-for-docker/settings-shared-drives-win.png) 
+![Shared Drives](./media/visual-studio-tools-for-docker/settings-shared-drives-win.png)
 
 ## Create an ASP.NET Web Application and add Docker Support
 
@@ -46,8 +45,8 @@ Project Context Menu
 
 The following files are added to the project.
 
-- **Dockerfile**: the Docker file for ASP.NET Core applications is based on the [microsoft/aspnetcore](https://hub.docker.com/r/microsoft/aspnetcore) image. This image includes the ASP.NET Core NuGet packages, which have been pre-jitted improving startup performance. When building .NET Core Console Applications, the Dockerfile FROM will reference the most recent [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet) image.
-- **docker-compose.yml**: base Docker Compose file used to define the collection of images to be built and run with docker-compose build/run.  
+- **Dockerfile**: the Docker file for ASP.NET Core applications is based on the [microsoft/aspnetcore](https://hub.docker.com/r/microsoft/aspnetcore) image. This image includes the ASP.NET Core NuGet packages, which have been pre-jitted improving startup performance. When building .NET Core Console Applications, the Dockerfile FROM will reference the most recent [microsoft/dotnet](https://hub.docker.com/r/microsoft/dotnet) image.   
+- **docker-compose.yml**: base Docker Compose file used to define the collection of images to be built and run with docker-compose build/run.   
 - **docker-compose.dev.debug.yml**: additional docker-compose file with for iterative changes when your configuration is set to debug. Visual Studio will call -f docker-compose.yml -f docker-compose.dev.debug.yml to merge these together. This compose file is used by Visual Studio development tools.   
 - **docker-compose.dev.release.yml**: additional Docker Compose file to debug your release definition. It will volume mount the debugger so it doesn't change the contents of the production image.  
 
@@ -72,6 +71,7 @@ In this example, `image: user/hellodockertools${TAG}` generates the image `user/
 You will want to change the `user` to your Docker Hub username if you plan to push the image to the registry. For example, `spboyer/hellodockertools`, or change to your private registry url `privateregistry.domain.com/` depending on your configuration.
 
 ### Debugging
+
 Select **Docker** from the debug dropdown in the toolbar and use F5 to start debugging the application. 
 
 - The microsoft/aspnetcore image is acquired (if not already in your cache)
@@ -97,6 +97,7 @@ CONTAINER ID        IMAGE                          COMMAND               CREATED
 ```
 
 ### Edit and Continue
+
 Changes to static files and/or razor template files (.cshtml) are automatically updated without the need of a compilation step. Make the change, save and tap refresh in the browser to view the update.  
 
 Modifications to code files require compiling and a restart of Kestrel within the container. After making the change, use CTRL + F5 to perform the process and start the application within the container. The Docker container is not rebuilt or stopped; using `docker ps` in the command line you can see that the original container is still running as of 10 minutes ago. 
@@ -106,7 +107,8 @@ CONTAINER ID        IMAGE                          COMMAND               CREATED
 3f240cf686c9        spboyer/hellodockertools:dev   "tail -f /dev/null"   10 minutes ago      Up 10 minutes       0.0.0.0:32769->80/tcp   hellodockertools_hellodockertools_1
 ```
 
-### Publishing Docker images 
+### Publishing Docker images
+
 Once you have completed the develop and debug cycle of your application, the Visual Studio Tools for Docker will help you create the production image of your application. Change the debug dropdown to **Release** and build the application. The tooling will produce the image with the `:latest` tag which you can push to your private registry or Docker Hub. 
 
 Using the `docker images` you can see the list of images.

docs/core/getting-started.md

@@ -22,8 +22,8 @@ Install .NET Core on [Windows](https://www.microsoft.com/net/core#windows).
 You can get started developing .NET Core apps by following these step-by-step tutorials.
 
 * [Building a C# Hello World Application with .NET Core in Visual Studio 2017](../csharp/getting-started/with-visual-studio.md) - Learn to to build, debug, and publish a simple .NET Core console application using Visual Studio 2017.
-* [Building a class library with C# and .NET Core in Visual Studio 2017](../csharp/getting-started/library-with-visual-studio-2017.md) - Learn how to build a class library written in C# using Visual Studio 2017
-* [Get started with Visual Studio Code using C# and .NET Core on Windows](https://channel9.msdn.com/Blogs/dotnet/Get-started-VSCode-Csharp-NET-Core-Windows) - This [Channel9](https://channel9.msdn.com) video shows you how to install and use [Visual Studio Code](https://code.visualstudio.com/), Microsoft's lightweight cross-platform code editor, to create your first console application in .NET Core.
+* [Building a class library with C# and .NET Core in Visual Studio 2017](../csharp/getting-started/library-with-visual-studio.md) - Learn how to build a class library written in C# using Visual Studio 2017.
+* [Get started with Visual Studio Code using C# and .NET Core on Windows](https://channel9.msdn.com/Blogs/dotnet/Get-started-with-VS-Code-using-CSharp-and-NET-Core) - This [Channel9](https://channel9.msdn.com) video shows you how to install and use [Visual Studio Code](https://www.visualstudio.com/products/code-vs), Microsoft's lightweight cross-platform code editor, to create your first console application in .NET Core.
 * [Get Started with .NET Core and Visual Studio 2017](https://channel9.msdn.com/Blogs/dotnet/Get-Started-NET-Core-Visual-Studio-2017) - This [Channel9](https://channel9.msdn.com) video shows you how to install and use [Visual Studio 2017](https://www.visualstudio.com/), Microsoft's fully-featured IDE, to create your first cross-platform console application in .NET Core.
 * [Getting started with .NET Core using the command-line](tutorials/using-with-xplat-cli.md) - Use any code editor with the [.NET Core cross-platform command-line interface (CLI)](tools/index.md).