Merge pull request #412 from Microsoft/master

merge to live

Author: ghogen

docs/code-quality/media/cppcorecheck_nuget_window.PNG

@@ -1,7 +1,7 @@
 ---
 title: "Setup and install | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "04/13/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
@@ -30,9 +30,9 @@ translation.priority.mt:
 # Setup and install
 To build native iOS, Android, and Windows apps from a common C#/.NET code base using Xamarin, you need the following:  
 
--   For working with Windows and Android apps: a Windows development computer with Visual Studio 2015 and Xamarin 4 installed (see note below). (You can also use Visual Studio 2013 by following the instructions for [direct Xamarin install](https://developer.xamarin.com/guides/cross-platform/getting_started/requirements/#install) (xamarin.com).)   
+-   For working with Windows and Android apps: a Windows development computer with Visual Studio 2017 or 2015 with Xamarin installed. You can also use Visual Studio 2013 by following the instructions for [direct Xamarin install](https://developer.xamarin.com/guides/cross-platform/getting_started/requirements/#install) (xamarin.com). 
 
--   For working with iOS apps: a Mac with OS X Yosemite (10.10.5) or above, with XCode and Xamarin installed.  
+-   For working with iOS apps: a Mac with macOS Sierra 10.12 or above, with Xcode and Xamarin installed.  
 
  You can set up the Windows and Mac computers at the same time, and while those installers are running you can go through [Learn about mobile development with Xamarin](../cross-platform/learn-about-mobile-development-with-xamarin.md) to read and watch the necessary background material.  
 
@@ -41,67 +41,48 @@ If you have issues using Xamarin after doing this setup and install, post your q
 > [!NOTE]
 >  As of March 31, 2016, all of Xamarin is included with all editions of Visual Studio at no extra cost and does not need a separate license. Xamarin Studio Community for Mac is also free for students, OSS developers, and small teams. Note that for existing installations of Visual Studio that are configured with earlier Xamarin licenses, you must update Xamarin to version 4.0.3.214 or higher. To do this, go to **Tools > Options > Xamarin > Other**, click the **Check Now** link, and download the 4.0.3.214 update. When you restart Visual Studio, go to **Tools > Xamarin Account...** and you should see updated status.  
   
- **In this topic:**  
-  
--   [Pre-requisites](#prereq)  
-  
--   [Windows setup (Visual Studio and Xamarin)](#windows)  
-  
--   [Mac setup (Apple ID, Xcode, and Xamarin)](#mac)  
-  
 ##  <a name="prereq"></a> Pre-requisites  
 
-1.  Xamarin account: go to [https://www.xamarin.com/](https://www.xamarin.com/) and click **Sign In** on the upper right of the page, then click **Create a new account** on the page that appears. Select an email address and password for your Xamarin account; you'll use these later on.  
+###  For targeting Windows and Android 
 
-2.  For targeting Windows and Android:  
+1.  Recommended: a physical Windows computer (not a VM) running Windows 8 or later, for best Android emulator performance. (Did we mention that you need a physical computer and not a VM?)  
 
-    1.  Recommended: a physical Windows computer (not a VM) running Windows 8 or later, which allows use of the fast, Hyper-V based Visual Studio Emulator for Android if you don't have an Android device. (Did we mention that you need a physical computer and not a VM?)  
-  
-    2.  You can use a computer with Windows 7 or earlier, in which case you’ll use the Xamarin Player for Android as the emulator. 
+2.  You can use a computer with Windows 7 or earlier, in which case you’ll use the Xamarin Player for Android as the emulator. 
 
-    3. For either configuration, you can always run apps directly on connected physical devices.  
+3. For either configuration, you can always run apps directly on connected physical devices.  
 
-3.  For targeting iOS:  
+### For targeting iOS  
 
-    1.  A networked Mac or Mac mini with OS X Yosemite running OS X 10.10.5 or later (required for Xcode 7.1).  
+1.  A networked Mac or Mac mini with macOS Sierra running macOS 10.12 or later (required for Xcode 8.3).  
 
-    2.  When using Visual Studio on a Windows (7+) computer as your primary development environment, a networked Mac is necessary only to compile and debug iOS apps, attach to the iOS simulator or tethered devices, and to use the storyboard designer in Visual Studio for designing the user interface. Older Mac models are entirely sufficient for this secondary role.  
+2.  When using Visual Studio on a Windows (7+) computer as your primary development environment, a networked Mac is necessary only to compile and debug iOS apps, attach to the iOS simulator or tethered devices, and to use the storyboard designer in Visual Studio for designing the user interface. Older Mac models are entirely sufficient for this secondary role.  
 
 ##  <a name="windows"></a> Windows setup (Visual Studio and Xamarin)  
 
 > [!TIP]
->  These instructions apply to Visual Studio 2015. To use Xamarin with Visual Studio 2013 (Update 2 is required),  follow the instructions for [direct Xamarin install](https://developer.xamarin.com/guides/cross-platform/getting_started/requirements/#install) (xamarin.com).  
+>  These instructions apply to Visual Studio 2017. For Visual Studio 2015 see [MSDN](https://msdn.microsoft.com/en-us/library/mt613162.aspx). To use Xamarin with Visual Studio 2013 (Update 2 is required),  follow the instructions for [direct Xamarin install](https://developer.xamarin.com/guides/cross-platform/getting_started/requirements/#install) (xamarin.com).  
   
-1.  [Download and launch the installer for any edition of Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx) (Community, Professional, or Enterprise). Visual Studio 2015 Community is the free edition; the Professional and Enterprise editions can be used on a trial basis for 30 days after which you'll need to purchase a license.  
+1.  [Download and launch the installer for any edition of Visual Studio 2017](https://www.visualstudio.com/downloads/) (Community, Professional, or Enterprise). Visual Studio 2017 Community is the free edition; the Professional and Enterprise editions can be used on a trial basis for 30 days after which you'll need to purchase a license.  
 
-    1.  If you already have Visual Studio installed, open **Control Panel > Programs and Features**, choose the **Visual Studio 2015** item, and click **Change**. When the installer opens, click **Modify** and skip to step 3 below.  
+    1.  If you already have Visual Studio 2017 installed, run the **Visual Studio Installer** from the **Start** menu.
 
-2.  (New installs only) Within the installer, select a **Custom** install:  
+2.  Within the installer, click the **Additional Choices** (three-bars icon) button _next to_ **Launch** then choose **Modify**.:  
 
-     ![Choosing the Custom option in Visual Studio installation](../cross-platform/media/cross-plat-xamarin-setup-1.png "Cross-Plat Xamarin Setup 1")  
+     ![Choosing the Modify option in Visual Studio installation](../cross-platform/media/cross-plat-xamarin-setup-1a.png "Cross-Plat Xamarin Setup 1")  
 
 3.  Check the following boxes:  
 
-    1.  **Cross-Platform Mobile Development > C#/.NET (Xamarin)**. This will also automatically select various Android tools under Common Tools and Software Development Kits. This option should also update any existing Xamarin installation.  
-  
-         ![Select the Xamarin option under Cross&#45;Platform Mobile Development](../cross-platform/media/cross-plat-xamarin-setup-2.png "Cross-Plat Xamarin Setup 2")  
-  
-    2.  For Windows 8+: **Cross-Platform Mobile Development > Microsoft Visual Studio Emulator for Android**. Note: if you’re using a Windows 7 or earlier computer, or running Windows on a Mac, make sure this is *unchecked*. See "Note about emulators on Windows computers" after step 5. You can also leave this unchecked if you intend to debug only on physical Android devices.  
-  
-    3.  (Optional) If you plan on targeting Windows devices, also check **Windows and Web Development > Universal Windows App Development Tools** and/or **Windows 8.1 and Windows Phone 8.0/8.1 Tools**. These include options for installing emulators images that will take longer to download; you can always return to the Visual Studio installer to add them later.  
+    1.  **Mobile & Gaming > Mobile Development with .NET**. This will also automatically select various Android tools under Common Tools and Software Development Kits. This option should also update any existing Xamarin installation.  
 
-4.  Click the Install button and let the process run. Again, this will take some time to complete, during which time you can continue with the Mac setup instructions and go through [Learn about mobile development with Xamarin](../cross-platform/learn-about-mobile-development-with-xamarin.md).  
+         ![Select the Mobile Development option under Gaming and Mobile Development](../cross-platform/media/cross-plat-xamarin-setup-2a.png "Cross-Plat Xamarin Setup 2")  
 
-5.  Once installation is complete, launch Visual Studio and sign in with your Microsoft account if prompted (this is the same account you use with Windows). Then check for Xamarin updates through **Tools > Options > Xamarin** or **Tools > Options > Xamarin > Other**, where you’ll find a **Check Now** link:  
+    2. (Optional) **Windows > Universal Windows Platform development**. This include options for installing emulators images that will take longer to download; you can always return to the Visual Studio installer to add them later. 
 
-     ![Checking for Xamarin updates in Visual Studio options](../cross-platform/media/cross-plat-xamarin-setup-3.png "Cross-Plat Xamarin Setup 3")  
+4.  Click the **Modify** button and let the process run. Again, this will take some time to complete, during which time you can continue with the Mac setup instructions and go through [Learn about mobile development with Xamarin](../cross-platform/learn-about-mobile-development-with-xamarin.md).  
 
-    > [!NOTE]
-    >  As noted earlier, be sure to update Xamarin to version 4.0.3.214 or higher to avoid issues with earlier Xamarin licenses.  
-
-    If you don't see an option for Xamarin in **Tools > Options**, double-check your installation, or try restarting Visual Studio. You can also search for Xamarin in the Options dialog.
+5.  Once installation is complete, launch Visual Studio and sign in with your Microsoft account if prompted (this is the same account you use with Windows).  
 
-6.  For Windows 7 and earlier, or running Windows on a Mac, use the [Android SDK Emulator](https://developer.xamarin.com/guides/android/deployment,_testing,_and_metrics/debug-on-emulator/android-sdk-emulator/) if you don't have physical devices. See note below.  
+6.  For testing Android apps, use the [Android SDK Emulator](https://developer.xamarin.com/guides/android/deployment,_testing,_and_metrics/debug-on-emulator/android-sdk-emulator/) if you don't have physical devices. See note below.  
 
  **Note about emulators on Windows computers:** Because CPUs support only one virtualization technology at a time, it’s best to have only one in use on a development computer. There are three main virtualizations technologies are Hyper-V (used by the Visual Studio Emulator for Android and the Windows Phone emulator), Virtual Box (used by Genymotion), and Intel HAXM (used by the Android SDK emulator). Because of various issues between Hyper-V and Virtual Box, it’s best to use emulators of only one type on any given computer, hence the recommendations above to use Hyper-V on Windows 8 and above computers, and Intel HAXM emulators on Windows 7 and earlier as well as when running Windows on a Mac.