Cleanup links and reconcile folder structure with other PRs.

smwentum · Nov 17, 2016 · 07b62bd · 07b62bd
1 parent 4635d84
commit 07b62bd
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 9 deletions.
diff --git a/.../tutorials/media/console-app-solution.png → .../tutorials/media/console-app-solution.png b/.../tutorials/media/console-app-solution.png → .../tutorials/media/console-app-solution.png
diff --git a/...torials/media/new-project-console-app.png → ...torials/media/new-project-console-app.png b/...torials/media/new-project-console-app.png → ...torials/media/new-project-console-app.png
diff --git a/...using-on-windows-vs-2017-full-solution.md → ...using-on-windows-vs-2017-full-solution.md b/...using-on-windows-vs-2017-full-solution.md → ...using-on-windows-vs-2017-full-solution.md
@@ -20,7 +20,7 @@ Visual Studio 2017 provides a full-featured development environment for developi
 
 ## Prerequisites
 
-Follow the instructions on [our prerequisites page](../../core/windows-prerequisites.md) to update your environment.
+Follow the instructions on [our prerequisites page](../windows-prerequisites.md) to update your environment.
 
 # A solution using only .NET Core projects
 

diff --git a/...ew3/tutorials/using-on-windows-vs-2017.md → ...ew3/tutorials/using-on-windows-vs-2017.md b/...ew3/tutorials/using-on-windows-vs-2017.md → ...ew3/tutorials/using-on-windows-vs-2017.md
@@ -20,7 +20,7 @@ Visual Studio 2017 provides a full-featured development environment for developi
 
 ## Prerequisites
 
-Follow the instructions on [our prerequisites page](../../core/windows-prerequisites.md) to update your environment.
+Follow the instructions on [our prerequisites page](../windows-prerequisites.md) to update your environment.
 
 ## Getting Started
 

diff --git a/...s/using-with-xplat-cli-msbuild-folders.md → ...s/using-with-xplat-cli-msbuild-folders.md b/...s/using-with-xplat-cli-msbuild-folders.md → ...s/using-with-xplat-cli-msbuild-folders.md
@@ -197,8 +197,7 @@ You'll probably be wanting to test your projects at some point.  Here's a good w
 
 ### Example: Extending the NewTypes project
 
-Now that the project system is in place, you can create your test project and start writing tests! From here on out, this guide will use and extend [the sample Types project](https://github.com/dotnet/docs/tree/master/samples/core/console-apps/NewTypes). Additionally, it will use the [Xunit](https://xunit.github.io/) test framework. Feel free to follow along or create your own multi-project system with tests.
-
+Now that the project system is in place, you can create your test project and start writing tests! From here on out, this guide will use and extend [the sample Types project](https://github.com/dotnet/docs/tree/master/samples/core/console-apps/NewTypesMsBuild). Additionally, it will use the [Xunit](https://xunit.github.io/) test framework. Feel free to follow along or create your own multi-project system with tests.
 
 The whole project structure should look like this:
 

diff --git a/...tutorials/using-with-xplat-cli-msbuild.md → ...tutorials/using-with-xplat-cli-msbuild.md b/...tutorials/using-with-xplat-cli-msbuild.md → ...tutorials/using-with-xplat-cli-msbuild.md
@@ -16,15 +16,15 @@ ms.assetid: be988f09-7349-43b0-97fb-3a703d4587ce
 
 This guide will show you how to use the .NET Core CLI tooling to build cross-platform console apps.  It will start with the most basic console app and eventually span multiple projects, including testing. You'll add these features step-by-step, building on what you've already seen and built.
 
-If you're unfamiliar with the .NET Core CLI toolset, read [the .NET Core SDK overview](../sdk.md).
+If you're unfamiliar with the .NET Core CLI toolset, read [the .NET Core SDK overview](../tools/dotnet.md).
 
 ## Prerequisites
 
-Before you begin, ensure you have the [latest .NET Core CLI tooling](https://www.microsoft.com/net/core).  You'll also need a text editor.
+Before you begin, ensure you have [.NET Core CLI tooling Preview 3 or later](https://github.com/dotnet/cli/releases/tag/v1.0.0-preview3-004056).  You'll also need a text editor.
 
 ## Hello, Console App!
 
-First, navigate to or create a new folder with a name you like.  "Hello" is the name chosen for the sample code, which can be found [here](https://github.com/dotnet/docs/tree/master/samples/core/console-apps/Hello).
+First, navigate to or create a new folder with a name you like.  "Hello" is the name chosen for the sample code, which can be found [here](https://github.com/dotnet/docs/tree/master/samples/core/console-apps/HelloMsBuild).
 
 Open up a command prompt and type the following:
 
@@ -131,7 +131,7 @@ Let's do a quick walkthrough:
     Hello .NET!
     ```
 
-    As an advanced scenario, it's possible to build the application as a self-contained set of platform-specific files that can be deployed and run to a machine that doesn't necessarily have .NET Core installed. See [.NET Core Application Deployment](../../cli-preview3/deploying/index.md) for details.
+    As an advanced scenario, it's possible to build the application as a self-contained set of platform-specific files that can be deployed and run to a machine that doesn't necessarily have .NET Core installed. See [.NET Core Application Deployment](../deploying/index.md) for details.
 
 ### Augmenting the program
 
@@ -310,4 +310,4 @@ And that's it!
 
 Hopefully this guide has helped you learn how to create a .NET Core console app, from the basics all the way up to a multi-project system with unit tests.  The next step is to create awesome console apps of your own!
 
-If a more advanced example of a console app interests you, check out the next tutorial: [Using the CLI tools to write console apps: An advanced step-by-step guide](cli-console-app-tutorial-advanced.md).
+If a more advanced example of a console app interests you, check out the next tutorial: [Organizing and testing projects with the .NET Core command line (SDK Preview 3)](using-with-xplat-cli-msbuild-folders.md).
diff --git a/docs/core/preview3/windows-prerequisites.md b/docs/core/preview3/windows-prerequisites.md
@@ -0,0 +1,60 @@
+---
+title: .NET Core Prerequisites (Preview 3 Tooling)
+description: .NET Core Prerequisites (Preview 3 Tooling)
+keywords: .NET, .NET Core
+author: billwagner
+manager: wpickett
+ms.date: 09/15/2016
+ms.topic: article
+ms.prod: .net-core
+ms.technology: .net-core-technologies
+ms.devlang: dotnet
+ms.assetid: c33b1241-ab66-4583-9eba-52cf51146f5a
+---
+
+# Prerequisites for Windows development (Preview 3 Tooling)
+
+.NET Core development on Windows with Visual Studio requires:
+
+* A supported version of the Windows client or operating system.
+* Visual Studio 2017 RC or later
+* .NET Core Tooling Preview 3
+
+## Supported Windows versions
+
+.NET Core is supported by the following versions of Windows:
+
+* Windows 7 SP1
+* Windows 8.1
+* Windows 10
+* Windows Server 2008 R2 SP1 (Full Server or Server Core)
+* Windows Server 2012 SP1 (Full Server or Server Core)
+* Windows Server 2012 R2 SP1 (Full Server or Server Core)
+* Windows Server 2016 (Full Server, Server Core or Nano Server)
+
+You can see the full set of [supported operating systems](https://github.com/dotnet/core/blob/master/release-notes/1.0/1.0.0.md#rtm-platform-support) in the [.NET Core Release Notes](https://github.com/dotnet/core/blob/master/release-notes/1.0/1.0.0.md).
+
+## .NET Core dependencies
+
+.NET Core requires the VC++ Redistributable when running on Windows. It is installed for you by the .NET Core installer. You need to install the Visual C++ redistributable manually if you are installing .NET Core via the installer script (`dotnet-install.ps1`). 
+
+The Visual C++ Redistributable version differs by Windows version.
+
+* Windows 10
+    * [Visual C++ Redistributable for Visual Studio 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48145)
+* Windows 7+ (not Windows 10)
+    * Please make sure that your Windows installation is up-to-date and includes hotfix [KB2533623](https://support.microsoft.com/en-us/kb/2533623) installed through Windows Update.
+    * [Universal CRT update](https://www.microsoft.com/en-us/download/details.aspx?id=48234) (you can get more info on what Universal CRT is in [this blog post](https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/))
+
+## Visual Studio
+
+You may develop .NET Core apps with any editor using the .NET Core command-line tools, but if you want to use Visual Studio and the Preview 3 of the .NET Core tooling, you need Visual Studio 2017 RC or later. You can download [Visual Studio Community 2017 RC](https://www.visualstudio.com/vs/visual-studio-2017-rc/) for free. 
+
+Verify that you're running Visual Studio 2017 RC:
+
+* On the **Help** menu, choose **About Microsoft Visual Studio**.
+* In the **About Microsoft Visual Studio** dialog, the version number should be 15.0.25831.1 or higher.
+
+You can read more about the changes in Visual Studio 2017 RC in the [release notes](https://www.visualstudio.com/en-us/news/releasenotes/vs2017-relnotes).
+
+Make sure you installed the ".NET Core and Docker (Preview)" workload during setup. If you didn't, it's possible to run the setup again and select it.
diff --git a/...e/console-apps/Hello-msbuild/Hello.csproj → ...re/console-apps/HelloMsBuild/Hello.csproj b/...e/console-apps/Hello-msbuild/Hello.csproj → ...re/console-apps/HelloMsBuild/Hello.csproj
diff --git a/...ore/console-apps/Hello-msbuild/Program.cs → ...core/console-apps/HelloMsBuild/Program.cs b/...ore/console-apps/Hello-msbuild/Program.cs → ...core/console-apps/HelloMsBuild/Program.cs
diff --git a/...core/console-apps/Hello-msbuild/README.md → .../core/console-apps/HelloMsBuild/README.md b/...core/console-apps/Hello-msbuild/README.md → .../core/console-apps/HelloMsBuild/README.md