Merge branch 'master' into live

.openpublishing.redirection.json

@@ -21,6 +21,11 @@
         "source_path": "docs/csharp/features.md", 
         "redirect_url": "/dotnet/articles/csharp/concepts"
     },
+    {
+        "source_path": "docs/csharp/getting-started/with-visual-studio-2017.md", 
+        "redirect_url": "/dotnet/articles/getting-started/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"

docs/core/getting-started.md

@@ -21,7 +21,7 @@ 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-2017.md) - Learn to to build, debug, and publish a simple .NET Core console application using Visual Studio 2017.
+* [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-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.
 * [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).

docs/core/migration/index.md

@@ -16,7 +16,7 @@ ms.assetid: 1feadf3d-3cfc-41dd-abb5-a4fc303a7b53
 This document will cover migration scenarios for .NET Core projects and will go over the following three migration scenarios:
 
 1. [Migration from a valid latest schema of *project.json* to *csproj*](#migration-from-projectjson-to-csproj)
-2. [Migration from DNX to csproj](from-dnx)
+2. [Migration from DNX to csproj](#migration-from-dnx-to-csproj)
 3. [Migration from RC3 and previous .NET Core csproj projects to the final format](#migration-from-earlier-net-core-csproj-formats-to-rtm-csproj)
 
 ## Migration from project.json to csproj
@@ -82,4 +82,4 @@ The .NET Core csproj format has been changing and evolving with each new pre-rel
 
 After these steps your project should be fully compatible with the RTM .NET Core csproj format. 
 
-For examples of before and after the migration from old csproj format to the new one, see the [Updating Visual Studio 2017 RC – .NET Core Tooling improvements](https://blogs.msdn.microsoft.com/dotnet/2016/12/12/updating-visual-studio-2017-rc-net-core-tooling-improvements/) article on the .NET blog.
+For examples of before and after the migration from old csproj format to the new one, see the [Updating Visual Studio 2017 RC – .NET Core Tooling improvements](https://blogs.msdn.microsoft.com/dotnet/2016/12/12/updating-visual-studio-2017-rc-net-core-tooling-improvements/) article on the .NET blog.

docs/core/tutorials/index.md

@@ -17,7 +17,7 @@ The following tutorials are available for learning about .NET Core.
 
 ## Building applications with Visual Studio 2017
 
-- [Building a C# Hello World application](../../csharp/getting-started/with-visual-studio-2017.md)
+- [Building a C# Hello World application](../../csharp/getting-started/with-visual-studio.md)
 - [Debugging your C# Hello World application](../../csharp/getting-started/debugging-with-visual-studio-2017.md)
 - [Publishing your C# Hello World application](../../csharp/getting-started/publishing-with-visual-studio-2017.md)
 - [Building a C# class library](../../csharp/getting-started/library-with-visual-studio-2017.md)

docs/core/tutorials/netcore-hosting.md

@@ -23,7 +23,7 @@ This article gives an overview of the steps necessary to start the .NET Core run
 
 Because hosts are native applications, this tutorial will cover constructing a C++ application to host .NET Core. You will need a C++ development environment (such as that provided by [Visual Studio](https://www.visualstudio.com/downloads/)).
 
-You will also want a simple .NET Core application to test the host with, so you should install the [.NET Core SDK](https://www.microsoft.com/net/core) and [build a small .NET Core test app](https://github.com/dotnet/docs/blob/master/docs/csharp/getting-started/with-visual-studio.md) (such as a 'Hello World' app). The 'Hello World' app created by the new .NET Core console project template is sufficient.
+You will also want a simple .NET Core application to test the host with, so you should install the [.NET Core SDK](https://www.microsoft.com/net/core) and [build a small .NET Core test app](../../csharp/getting-started/with-visual-studio.md) (such as a 'Hello World' app). The 'Hello World' app created by the new .NET Core console project template is sufficient.
 
 This tutorial and its [associated sample](https://github.com/dotnet/docs/tree/master/samples/core/hosting) build a Windows host, but please see the notes at the end of this article about hosting on Unix.
 

docs/core/tutorials/using-on-windows.md

@@ -6,4 +6,4 @@ redirect_url: /dotnet/articles/csharp/getting-started/with-visual-studio-2017
 
 ## Content retired!
 
-For a getting started tutorial on .NET Core and Visual Studio 2017, see [(Building a C# Hello World application with .NET Core in Visual Studio 2017](../../csharp/getting-started/with-visual-studio-2017.md).
+For a getting started tutorial on .NET Core and Visual Studio 2017, see [(Building a C# Hello World application with .NET Core in Visual Studio 2017](../../csharp/getting-started/with-visual-studio.md).

docs/core/windows-prerequisites.md

@@ -4,7 +4,7 @@ description: Learn what dependencies you need on your Windows machine to develop
 keywords: .NET Core, Windows, prerequisites, dependencies, Visual Studio
 author: mairaw
 ms.author: mairaw
-ms.date: 01/05/2017
+ms.date: 03/07/2017
 ms.topic: article
 ms.prod: .net-core
 ms.devlang: dotnet
@@ -41,10 +41,19 @@ You can see the full set of [supported operating systems](https://github.com/dot
 
 You can use any editor of your choice to develop .NET Core applications using the .NET Core SDK. However, if you want to develop .NET Core applications on Windows in an integrated development environment, you can use [Visual Studio 2017](#visual-studio-2017).
 
+> [!IMPORTANT]
+> Even though, it's possible to use Visual Studio 2015 with a preview version of the .NET Core tooling, these projects will be *project.json*-based, which is now deprecated. Visual Studio 2017 uses project files based on MSBuild. For more information about the format changes, see [High-level overview of changes](./tools/cli-msbuild-architecture.md).
+
 To use Visual Studio 2017 to develop .NET Core apps, you'll need to have the latest version of Visual Studio installed with the **.NET Core cross-platform development** toolset (in the **Other Toolsets** section) selected.
+![Screenshot of Visual Studio 2017 installation with the ".NET Core cross-platform development" workload selected](./media/windows-prerequisites/vs_workloads.jpg)
+
+There are different editions of Visual Studio 2017. You can download [Visual Studio Community 2017](https://www.visualstudio.com/downloads/) for free to get started.  To learn more about the Visual Studio installation process, see [Install Visual Studio 2017](https://docs.microsoft.com/en-us/visualstudio/install/install-visual-studio).
 
-There are different editions of Visual Studio 2017. You can download [Visual Studio Community 2017](https://www.visualstudio.com/vs/visual-studio-2017/#downloadvs) for free to get started.  To learn more about the Visual Studio installation process, see [Install Visual Studio 2017](https://docs.microsoft.com/en-us/visualstudio/install/install-visual-studio).
++To verify that you're running the latest version of Visual Studio 2017, do the following:
+ +
+ +* On the **Help** menu, choose **About Microsoft Visual Studio**.
+ +* In the **About Microsoft Visual Studio** dialog, the version number should be 15.0.26228.4 or higher.
 
 You can read more about the changes in Visual Studio 2017 in the [release notes](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-relnotes).
 
-[sdk]: https://go.microsoft.com/fwlink/?LinkID=827546
+[sdk]: https://go.microsoft.com/fwlink/?LinkID=827546

docs/csharp/getting-started/publishing-with-visual-studio-2017.md

@@ -48,4 +48,4 @@ To publish and run your application:
 
 The publishing process creates a framework-dependent deployment; the published application will run on any platform supported by .NET Core, as long as .NET Core is installed on the system. Users can run your application by issuing the `dotnet.exe HelloWorld.dll` command from a console window.
 
-For more information on publishing and deploying .NET Core applications, see [.NET Core Application Deployment](../../core/deploying/index.md).
+For more information on publishing and deploying .NET Core applications, see [.NET Core Application Deployment](../../core/deploying/index.md).

docs/csharp/getting-started/toc.md

@@ -5,9 +5,6 @@
 ## [Building a class library with C# and .NET Core in Visual Studio 2017](library-with-visual-studio-2017.md)
 ### [Testing a class library with .NET Core in Visual Studio 2017](testing-library-with-visual-studio.md)
 ### [Consuming a class library with .NET Core in Visual Studio 2017](consuming-library-with-visual-studio-2017.md)
-## [Getting started with Visual Studio 2015](with-visual-studio.md)
-### [Debugging your Hello World application with Visual Studio 2015](debugging-with-visual-studio.md)
-### [Publishing your Hello World application with Visual Studio 2015](publishing-with-visual-studio.md)
 ## [Getting started with Visual Studio Code](with-visual-studio-code.md)
 ## [🔧 Getting started with cross-platform tools](with-cross-platform-tools.md)
-## [🔧 Getting started with C# Interactive](with-csharp-interactive.md)
+## [🔧 Getting started with C# Interactive](with-csharp-interactive.md)