Merge pull request #2124 from dantogno/master

Updating to reflect changes in Unity 2018.1

Author: rjagiewich

mac/media/setup-vsmac-tools-unity-image7.png

@@ -3,7 +3,7 @@ title: "Setup Visual Studio for Mac Tools for Unity"
 description: "Setting up and installing Unity tools for use in Visual Studio for Mac"
 author: dantogno
 ms.author: v-davian
-ms.date: 07/17/2017
+ms.date: 05/25/2018
 ms.assetid: 83FDD7A3-5D16-4B4B-9080-078E3FB5C623
 ---
 # Setup Visual Studio for Mac Tools for Unity
@@ -12,49 +12,67 @@ This section explains how to get started using Visual Studio for Mac Tools for U
 
 ## Install Visual Studio for Mac
 
-Download and install Visual Studio for Mac. All editions of Visual Studio for Mac support Visual Studio for Mac Tools for Unity, including the free Community edition:
+### Unity Bundled Installation
+
+Starting with Unity 2018.1, Visual Studio for Mac is the default C# IDE for Unity, and is included in the Unity Download Assistant, as well as the Unity Hub installation tool. Download Unity from [store.unity.com](https://store.unity.com/).
+
+During installation, ensure that Visual Studio for Mac is checked in the list of components to install with Unity:
+
+#### Unity Hub
+
+![unity hub installation](media/setup-vsmac-tools-unity-image7.png)
+
+#### Unity Download Assistant
+
+![unity download assistant installation](media/setup-vsmac-tools-unity-image8.png)
+
+#### Check for Updates to Visual Studio for Mac
+
+The version of Visual Studio for Mac included with the Unity installation may not be the latest. It is recommended to check for updates to ensure you have access to the latest tools and features.
+
+* [Updating Visual Studio for Mac](update.md)
+
+### Manual installation
+
+If you already have Unity 5.6.1 or above, but don't have Visual Studio for Mac, you can install Visual Studio for Mac manually. All editions of Visual Studio for Mac are bundled with Visual Studio for Mac Tools for Unity, including the free Community edition:
 
 * Download Visual Studio for Mac from [visualstudio.com](https://www.visualstudio.com/).
 * Visual Studio for Mac Tools for Unity are installed automatically during the installation process.
 * Follow the steps in the [installation guide](installation.md) for additional installation help.
 
+> [!NOTE]
+> Visual Studio for Mac Tools for Unity requires Unity version 5.6.1 or above. To verify that Visual Studio Tools for Unity are enabled in your version of Unity, select **About Unity** from the Unity menu and look for the text "Microsoft Visual Studio Tools for Unity enabled" in the bottom-left of the dialog.
+>
+> ![About Unity](media/setup-vsmac-tools-unity-image3.png)
+
 ## Confirm that the Visual Studio for Mac Tools for Unity extension is enabled
 
 While the Visual Studio for Mac Tools for Unity extension should be enabled by default, you can confirm this and check the installed version number:
 
-1.  From the Visual Studio menu, select **Extensions...**.
+1. From the Visual Studio menu, select **Extensions...**.
 
   ![Select Extensions](media/setup-vsmac-tools-unity-image1.png)
 
-2.  Expand the Game Development section and confirm the Visual Studio for Mac Tools for Unity entry.
+1. Expand the Game Development section and confirm the Visual Studio for Mac Tools for Unity entry.
 
   ![View Unity Entry](media/setup-vsmac-tools-unity-image2.png)
 
-## Install Unity
-
-Visual Studio for Mac Tools for Unity requires Unity version 5.6.1 or above. All Unity plans work with Visual Studio Tools for Unity, including the free Personal plan. Download Unity from [store.unity.com](https://store.unity.com/).
-
-> [!NOTE]
-> To verify that Visual Studio Tools for Unity are enabled in your version of Unity, select **About Unity** from the Unity menu and look for the text "Microsoft Visual Studio Tools for Unity enabled" in the bottom-left of the dialog.
->
->   ![About Unity](media/setup-vsmac-tools-unity-image3.png)
-
 ## Configure Unity for use with Visual Studio for Mac
 
-Visual Studio must be set as the external script editor in Unity:
+Starting with Unity 2018.1, Visual Studio should be the default external script editor in Unity. You can confirm this or change the external script editor to Visual Studio:
 
-1.	Select **Preferences...** from the Unity menu.
+1. Select **Preferences...** from the Unity menu.
 
   ![Select Preferences](media/setup-vsmac-tools-unity-image4.png)
 
-2.	In the Preferences dialog, select the **External Tools** tab.
+1. In the Preferences dialog, select the **External Tools** tab.
 
-3.	From the External Script Editor dropdown list, choose **Visual Studio** if it is listed, otherwise select **Browse...**.
+1. From the External Script Editor dropdown list, choose **Visual Studio** if it is listed, otherwise select **Browse...**.
 
   ![Select Visual Studio](media/setup-vsmac-tools-unity-image5.png)
 
-4.	If **Browse...** was selected, navigate to the Applications directory and select Visual Studio and then click **Open**.
+1. If **Browse...** was selected, navigate to the Applications directory and select Visual Studio and then click **Open**.
 
   ![Select Open](media/setup-vsmac-tools-unity-image6.png)
 
-5.	Once Visual Studio is selected in the **External Script Editor** list, close the Preferences dialog to complete the configuration process.
+1. Once Visual Studio is selected in the **External Script Editor** list, close the Preferences dialog to complete the configuration process.

mac/media/setup-vsmac-tools-unity-image8.png

@@ -3,23 +3,24 @@ title: "Visual Studio for Mac Tools for Unity"
 description: "Introducing the Visual Studio Tools for Unity extension"
 author: dantogno
 ms.author: v-davian
-ms.date: 07/17/2017
+ms.date: 05/25/2018
 ms.assetid: 83FDD7A3-5D16-4B4B-9080-078E3FB5C623
 ---
-
 # Visual Studio for Mac Tools for Unity
 
 ![Stylized image of Unity and Visual Studio for Mac](media/vsmac-tools-unity-image1.png)
 
-Visual Studio for Mac Tools for Unity is a free Visual Studio extension that turns Visual Studio for Mac into a powerful tool for developing cross-platform games and apps with the Unity platform.
+Visual Studio for Mac Tools for Unity is a free Visual Studio extension that turns Visual Studio for Mac into a powerful tool for developing cross-platform games and apps with the Unity platform. 
+
+Unity integration is included out of the box in Visual Studio for Mac, and starting from Unity 2018.1, Visual Studio for Mac is the default C# IDE for Unity projects.
 
-## Overview 
+## Overview
 
 Here are some of the key features of Visual Studio for Mac Tools for Unity:
 
 ### Compatible with Visual Studio for Mac Community Edition
 
-[Visual Studio for Mac Community Edition](https://www.visualstudio.com/) is available for free.
+[Visual Studio for Mac Community Edition](https://www.visualstudio.com/) is available for free, and bundled with Unity installs starting with Unity 2018.1. See the Visual Studio for Mac Tools for Unity [setup documentation](setup-vsmac-tools-unity.md) for more information.
 
 ### IntelliSense for Unity messages
 
@@ -29,13 +30,10 @@ IntelliSense makes it fast and easy to [implement Unity messages](using-vsmac-to
 
 Visual Studio for Mac Tools for Unity supports all the [debugging](using-vsmac-tools-unity.md#unity-debugging) features that you expect from Visual Studio:
 
-*	Set breakpoints, including conditional breakpoints.
-
-*	Evaluate complex expressions in the Watch window.
-
-*	Inspect and modify the value of variables and arguments.
-
-*	Drill down into complex objects and data structures.
+* Set breakpoints, including conditional breakpoints.
+* Evaluate complex expressions in the Watch window.
+* Inspect and modify the value of variables and arguments.
+* Drill down into complex objects and data structures.
 
 ### Powerful refactoring and context actions