Merge pull request #1778 from MicrosoftDocs/FromPublicMaster

Confirm merge from FromPublicMaster to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: gewarren

docs/cross-platform/troubleshooting-and-known-issues-visual-studio-tools-for-unity.md

@@ -1,7 +1,7 @@
 ---
 title: "Troubleshooting and Known Issues (Visual Studio Tools for Unity) | Microsoft Docs"
 ms.custom: ""
-ms.date: "10/25/2017"
+ms.date: "04/10/2018"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: vs-unity-tools
@@ -46,14 +46,25 @@ For FMOD, there is a workaround, you can pass FMOD_STUDIO_INIT_SYNCHRONOUS_UPDAT
 ### Incompatible project in Visual Studio
 First, check that Visual Studio is set as your external script editor in Unity (Edit/Preferences/External Tools). Then check that the Visual Studio   plugin is installed in Unity (Help/About must display a message like Microsoft Visual Studio Tools for Unity is enabled at the bottom). Then check that the extension is properly installed in Visual Studio (Help/About).
 
+### Extra reloads, or Visual Studio losing all open windows
+Be sure to never touch project files directly from an asset processor or any other tool. If you really need to manipulate the project file, we expose an API for that. Please check the [Assembly references issues section](#Assembly-reference-issues).
+
+If you experience extra reloads or if Visual Studio is losing all open Windows on reload, please make sure that you have proper .NET targeting packs installed. Please check the following section about frameworks for more information.
+
+
+### On Windows, Visual Studio asks to download the Unity target framework
+Visual Studio Tools for Unity requires the .NET framework 3.5, which isn't installed by default on Windows 8 or 10. To fix this issue, follow the instructions to download and install the .NET framework 3.5.
+
+When using the new Unity runtime, .NET targeting packs version 4.6 and 4.7.1 are also required. It is possible to use the VS2017 installer to quickly install them (modify your VS2017 installation, individual components, .NET category, select all 4.x targeting packs).
+
 ### Assembly reference issues
 If your project is complex reference-wise or if you want to better control this generation step, you can use our [API](../cross-platform/customize-project-files-created-by-vstu.md) for manipulating the generated project or solution content. You can also use [response files](https://docs.unity3d.com/Manual/PlatformDependentCompilation.html) in your Unity project and we'll process them.
 
 ### Breakpoints with a warning
 If Visual Studio is unable to find a source location for a specific breakpoint you will see a warning around your breakpoint. Check that the behaviour you are using is properly loaded/used in the current Unity scene.
 
 ### Breakpoints not hit
- Check that the behaviour you are using is properly loaded/used in the current Unity scene. Quit both Visual Studio and Unity then delete all generated files (*.csproj, *.sln) and the whole Library folder.
+Check that the behaviour you are using is properly loaded/used in the current Unity scene. Quit both Visual Studio and Unity then delete all generated files (*.csproj, *.sln) and the whole Library folder.
 
 ### Unable to attach
 -	Try to temporarily disable your antivirus or create exclusion rules for both VS and Unity.
@@ -64,22 +75,9 @@ If Visual Studio is unable to find a source location for a specific breakpoint y
 ### Unable to debug Android players
 We use multicast for player detection (which is the default mechanism used by Unity), but after that we use a regular TCP connection to attach the debugger. The detection phase is the main issue for Android devices.
 
-USB is super-fast for debugging, but not compatible with the Unity player discovery mechanism.
-Wifi is more versatile but super slow compared to USB because of latency. We saw a lack of proper multicast support for some routers or devices (Nexus series are well known for this).
-
-You could try the following using USB to see opened ports on the connected device (with the player up and running so that you can see the debugging port, always in the form 56xxx):
+Wifi is versatile but super slow compared to USB because of latency. We saw a lack of proper multicast support for some routers or devices (Nexus series are well known for this).
 
-```shell
-adb shell netstat
-```
-
-Forward the port to the local pc:
-
-```shell
-adb forward tcp:56xxx tcp:56xxx
-```
-
-Then, connect VSTU using the forwarded port 127.0.0.1:56xxx.
+USB is super-fast for debugging, and Visual Studio Tools for Unity is now able to detect USB devices, and talk to the adb server to properly forward ports for debugging.
 
 ### Migrating from UnityVS to Visual Studio Tools for Unity
  If you're migrating from UnityVS to Visual Studio Tools for Unity, you'll need to generate new Visual Studio solutions for your Unity projects.
@@ -92,9 +90,6 @@ Then, connect VSTU using the forwarded port 127.0.0.1:56xxx.
 
 3.  Generate the new solution and project files. If you want to generate them now, in the Unity Editor, on the main menu, choose **Visual Studio Tools**, **Generate Project Files**. Otherwise, you can skip this step if you want; Visual Studio Tools for Unity will generate the new files automatically when you choose **Visual Studio Tools**, **Open in Visual Studio**.
 
-### On Windows, Visual Studio asks to download the Unity target framework
- Visual Studio Tools for Unity requires the .net framework 3.5, which isn't installed by default on Windows 8 or 10. To fix this issue, follow the instructions to download and install the .net framework 3.5.
-
 ## Known Issues
  There are known issues in Visual Studio Tools for Unity that result from how the debugger interacts with Unity's older version of the C# compiler. We're working to help fix these problems, but you might experience the following issues in the meantime:
 

docs/extensibility/creating-reusable-groups-of-buttons.md

@@ -43,7 +43,7 @@ A command group is a collection of commands that always appear together on a men
     </GuidSymbol>  
     ```  
 
-     By default, the command item template creates a group named **MyGroup** and a button that has the name that you provided, together with an IDSymbol entry for each.  
+     By default, the command item template creates a group named **MyMenuGroup** and a button that has the name that you provided, together with an IDSymbol entry for each.  
 
 5.  In the Groups section, create a Group element that has the same GUID and ID attributes as the ones given in the Symbols section. You can also use an existing group, or use the entry that is provided by the command template, as in the following example. This group appears on the **Tools** menu  
 
@@ -119,4 +119,4 @@ A command group is a collection of commands that always appear together on a men
       </CommandPlacement>  
     </CommandPlacements>  
 
-    ```
+    ```

docs/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference.md

@@ -142,7 +142,7 @@ TEST_CLASS_INITIALIZE(methodName)
 }
 ```
 
- Defines *methodName* as a method that runs after each test class is created. `TEST_CLASS_INITIALIZE` can only be defined once in a test class and must be defined in the scope of the test class.
+ Defines *methodName* as a method that runs before each test class is created. `TEST_CLASS_INITIALIZE` can only be defined once in a test class and must be defined in the scope of the test class.
 
 ```cpp
 TEST_CLASS_CLEANUP(methodName)