Merge remote-tracking branch 'upstream/master'

Author: PoulChapman

.openpublishing.publish.config.json

@@ -38,6 +38,7 @@
       "build_source_folder": "docs",
       "build_output_subfolder": "vsdocsdocs",
       "locale": "en-us",
+      "xref_query_tags": ["/dotnet"],
       "monikers": [],
       "open_to_public_contributors": true,
       "type_mapping": {

.openpublishing.redirection.json

@@ -1842,6 +1842,11 @@
             "redirect_url": "/visualstudio/test/unit-test-your-code",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/test/lab-management/upgrade-scvmm-2008-r2-scvmm-2012.md",
+            "redirect_url": "/visualstudio/test/lab-management/using-a-lab-environment-for-your-application-lifecycle",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/test/using-microsoft-visualstudio-testtools-cppunittestframework.md",
             "redirect_url": "/visualstudio/test/microsoft.visualstudio.testtools.cppunittestframework-api-reference",
@@ -1852,6 +1857,11 @@
             "redirect_url": "/visualstudio/test/writing-unit-tests-for-c-cpp",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/test/writing-unit-tests-for-the-dotnet-framework-with-the-microsoft-unit-test-framework-for-managed-code.md",
+            "redirect_url": "/visualstudio/test/unit-test-your-code",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/vb-ide/code-generation-vb.md",
             "redirect_url": "/visualstudio/ide/code-generation-in-visual-studio",

docs/debugger/how-to-use-intellitrace-step-back.md

@@ -103,4 +103,6 @@ The impact on overall stepping performance depends on your application. The over
     Workaround:
     * Clear all snapshots by ending the debugging session. 
 
+* When debugging an application whose process has a high number of unique memory regions, such as an application that loads a large number of DLLs, stepping performance with snapshots enabled may be impacted. This issue will be addressed in a future version of Windows. If you are experiencing this issue, reach out to us at [email protected]. 
+
 * When saving a file with **Debug > IntelliTrace > Save IntelliTrace session** under events and snapshots mode, the additional data captured from snapshots is not available in the .itrace file. On breakpoint and step events, you see the same information as if you had saved the file in IntelliTrace events only mode. 

docs/index.md

@@ -3,6 +3,7 @@ layout: HubPage
 hide_bc: true
 title: Visual Studio Documentation | Microsoft Docs
 description: Learn how to use Visual Studio 2017 to develop applications, services, and tools in the language of your choice, for your platforms and devices.
+ms.topic: hub-page
 ---
 <div id="main" class="v2">
     <div class="container">

docs/install/update-visual-studio.md

@@ -1,7 +1,7 @@
 ---
 title: "Update Visual Studio 2017 | Microsoft Docs"
 description: "Learn how to update Visual Studio, step-by-step."
-ms.date: "03/05/2018"
+ms.date: "03/06/2018"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology:
@@ -29,7 +29,7 @@ And if you'd like to try out anything before we release it, consider downloading
 
 ## Update Visual Studio 2017 version 15.6 or later
 
-New with version 15.6: We've streamlined the installation and update experience to make it easier to use directly from within the IDE. Here's how.
+We've streamlined the installation and update experience to make it easier to use directly from within the IDE. Here's how to update from version 15.6 and later to newer versions of Visual Studio.
 
 ### Use the Notifications hub
 
@@ -86,7 +86,7 @@ As in earlier versions of Visual Studio 2017, you can use the Visual Studio Inst
 
 ## Update Visual Studio 2017 version 15.5 or earlier
 
-If you are using an earlier version of Visual Studio 2017, here's how to update to the newest version.
+If you are using an earlier version, here's how to apply an update from Visual Studio 2017 version 15.0 through version 15.5.
 
 ### Update by using the Notifications hub
 

docs/install/using-visual-studio-vm.md

@@ -1,7 +1,7 @@
 ---
 title: "Using Visual Studio on an Azure Virtual Machine | Microsoft Docs"
 description: "Learn how to use Visual Studio on an Azure Virtual Machine"
-ms.date: "01/30/2018"
+ms.date: "03/03/2018"
 ms.technology: "vs-acquisition"
 ms.topic: "article"
 helpviewer_keywords: 
@@ -17,37 +17,37 @@ ms.workload: 
 ---
 
 # <a id="top"> </a> Visual Studio images on Azure
-Using Visual Studio running in a preconfigured Azure virtual machine (VM) is the easiest and fastest way to go from nothing to an up-and-running development environment.  System images with different Visual Studio configurations are available in the [Azure Marketplace](https://portal.azure.com/). Just boot a VM and off you go.
+Using Visual Studio in a preconfigured Azure virtual machine (VM) is a quick, easy way to go from nothing to an up-and-running development environment. System images with different Visual Studio configurations are available in the [Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps?search=%22visual%20studio%202017%22&page=1).
 
 New to Azure? [Create a free Azure account](https://azure.microsoft.com/free).
 
 ## What configurations and versions are available?
-In the Azure Marketplace, you find images for the most recent major versions:  Visual Studio 2017 and Visual Studio 2015.  For each major version, you see the originally released (a.k.a. ‘RTW’) version, and the “latest” updated versions.  For each of these different versions, you find the Visual Studio Enterprise and Visual Studio Community editions.  We update these images at least every month to include the latest Visual Studio and Windows updates.  While the names of the images remain the same, each image's description includes the installed product version and the image's 'as of' date.
+Images for the most recent major versions, Visual Studio 2017 and Visual Studio 2015, can be found in the Azure Marketplace. For each major version, you see the originally released (RTW) version and the latest updated versions. Each of these versions offers the Visual Studio Enterprise and the Visual Studio Community editions. These images are updated at least every month to include the latest Visual Studio and Windows updates. While the names of the images remain the same, each image's description includes the installed product version and the image's "as of" date.
 
-|               Release version              |        Editions       |     Product Version     |
-|:------------------------------------------:|:---------------------:|:-----------------------:|
-| Visual Studio 2017 - Latest (version 15.5) | Enterprise, Community |      Version 15.5.3     |
-|         Visual Studio 2017 - RTW           | Enterprise, Community |      Version 15.0.7     |
-|   Visual Studio 2015 - Latest (Update 3)   | Enterprise, Community |  Version 14.0.25431.01  |
-|         Visual Studio 2015 - RTW           |         None          | (Expired for servicing) |
+| Release version              | Editions            | Product version     |
+|:-----------------------------------------:|:----------------------------:|:-----------------------:|
+| Visual Studio 2017: Latest (Version 15.6) |    Enterprise, Community     |      Version 15.6.0     |
+|         Visual Studio 2017: RTW           |    Enterprise, Community     |      Version 15.0.10    |
+|   Visual Studio 2015: Latest (Update 3)   |    Enterprise, Community     |  Version 14.0.25431.01  |
+|         Visual Studio 2015: RTW           |             None             | (Expired for servicing) |
 
 > [!NOTE]
-> In accordance with Microsoft servicing policy, the originally released (aka ‘RTW’) version of Visual Studio 2015 has expired for servicing.  Therefore, Visual Studio 2015 Update 3 is the only remaining version offered for the Visual Studio 2015 product line.
+> In accordance with Microsoft servicing policy, the originally released (RTW) version of Visual Studio 2015 has expired for servicing. Visual Studio 2015 Update 3 is the only remaining version offered for the Visual Studio 2015 product line.
 
-For more information, see the [Visual Studio Servicing Policy](https://www.visualstudio.com/en-us/productinfo/vs-servicing-vs).
+For more information, see the [Visual Studio Servicing Policy](/visualstudio/productinfo/vs-servicing-vs).
 
 ## What features are installed?
-Each image contains the recommended feature set for that Visual Studio edition.  Generally, the installation includes:
+Each image contains the recommended feature set for that Visual Studio edition. Generally, the installation includes:
 
-* All available workloads including that workload’s recommended optional components
+* All available workloads, including each workload’s recommended optional components
 * .NET 4.6.2 and .NET 4.7 SDKs, Targeting Packs, and Developer Tools
 * Visual F#
 * GitHub Extension for Visual Studio
 * LINQ to SQL Tools
 
-This is the command line that we use to install Visual Studio when building the images:
+We use the following command line to install Visual Studio when building the images:
 
-```
+```shell
     vs_enterprise.exe --allWorkloads --includeRecommended --passive ^
        add Microsoft.Net.Component.4.7.SDK ^
        add Microsoft.Net.Component.4.7.TargetingPack ^ 
@@ -59,10 +59,10 @@ This is the command line that we use to install Visual Studio when building the
        add Microsoft.VisualStudio.Component.LinqToSql
 ```
 
-If the images don't include a Visual Studio feature you require, provide that feedback through the feedback tool (top-right corner of the page).
+If the images don't include a Visual Studio feature that you require, provide feedback through the feedback tool in the upper-right corner of the page.
 
 ## What size VM should I choose?
-Provisioning a new virtual machine is easy, and Azure offers a full range of virtual machine sizes.  As with any hardware acquisition, you want to balance performance versus cost.  Since Visual Studio is a powerful, multi-threaded application, you want a VM size that includes at least 2 processors and 7 GB of memory. In Azure that translates to at least these VM sizes:
+Azure offers a full range of virtual machine sizes. Because Visual Studio is a powerful, multi-threaded application, you want a VM size that includes at least two processors and 7 GB of memory. We recommend the following VM sizes for the Visual Studio images:
 
    * Standard_D2_v3
    * Standard_D2s_v3
@@ -71,33 +71,38 @@ Provisioning a new virtual machine is easy, and Azure offers a full range of vir
    * Standard_D2_v2
    * Standard_D2S_v2
    * Standard_D3_v2
+    
+For more information on the latest machine sizes, see [Sizes for Windows virtual machines in Azure](/azure/virtual-machines/windows/sizes).
 
-For more information on the latest machine sizes, see [Sizes for Windows virtual machines in Azure](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes).
+With Azure, you can rebalance your initial choice by resizing the VM. You can either provision a new VM with a more appropriate size, or resize your existing VM to different underlying hardware. For more information, see [Resize a Windows VM](/azure/virtual-machines/windows/resize-vm).
 
-With Azure, you’re not stuck with your first pick – you can rebalance your initial choice by resizing the VM.  You can either provision a new VM with a more appropriate size, or you can resize your existing VM to different underlying hardware.  For more information, see [Resizing a Windows VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/resize-vm).
+## After the VM is running, what's next?
+Visual Studio follows the “bring your own license” model in Azure. As with an installation on proprietary hardware, one of the first steps is licensing your Visual Studio installation. To unlock Visual Studio, either:
+- Sign in with a Microsoft account that’s associated with a Visual Studio subscription 
+- Unlock Visual Studio with the product key that came with your initial purchase
 
-## After I get the VM running, then what?
-Visual Studio follows the “bring you own license” model in Azure.  So, similarly to an installation on proprietary hardware, one of the first steps is licensing your Visual Studio installation.  You can unlock Visual Studio by either signing in with a Microsoft account that’s associated with a Visual Studio subscription, or you can unlock Visual Studio with the product key with your initial purchase.  For more information, see [Signing in to Visual Studio](https://docs.microsoft.com/en-us/visualstudio/ide/signing-in-to-visual-studio) and [How to unlock Visual Studio](https://docs.microsoft.com/en-us/visualstudio/ide/how-to-unlock-visual-studio).
+For more information, see [Sign in to Visual Studio](../ide/signing-in-to-visual-studio.md) and [How to unlock Visual Studio](../ide/how-to-unlock-visual-studio.md).
 
-## After I build out the dev VM, how do I save (capture) it for future or team use?
+## How do I save the development VM for future or team use?
 
-The spectrum of development environments is huge, and there’s real cost associated with building out the more complex environments.  However, regardless of your environment’s configuration, Azure makes preserving that investment easy by saving/capturing your perfectly configured VM as a ‘base image’ for future use – for yourself and/or for other members of your team.  Then, when booting a new VM, provision it from the base image rather than the Marketplace image.
+The spectrum of development environments is huge, and there’s real cost associated with building out the more complex environments. Regardless of your environment’s configuration, you can save, or capture, your configured VM as a "base image" for future use or for other members of your team. Then, when booting a new VM, you provision it from the base image rather than the Azure Marketplace image.
 
-As a quick summary, you’ll need to sysprep and shutdown the running VM, then *capture (Figure 1)* the VM as an image through the Azure portal’s UI.  Azure saves the `.vhd` file that contains the image in the storage account of your choosing.  Then, the new image shows up as an Image resource in your subscription’s list of resources.
+A quick summary: Use the System Preparation tool (Sysprep) and shut down the running VM, and then capture *(Figure 1)* the VM as an image through the UI in the Azure portal. Azure saves the `.vhd` file that contains the image in the storage account of your choosing. The new image then shows up as an Image resource in your subscription’s list of resources.
 
 <img src="media/capture-vm.png" alt="Capture an image through the Azure portal’s UI" style="border:3px solid Silver; display: block; margin: auto;"><center>*(Figure 1) Capture an image through the Azure portal’s UI.*</center>
 
-For more information, see [Capturing a VM to an image](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/capture-image-resource).
+For more information, see [Create a managed image of a generalized VM in Azure](/azure/virtual-machines/windows/capture-image-resource).
 
-  **Reminder:**  Don’t forget to sysprep the VM!  If you miss that step, Azure can't provision a VM from the image.
+> [!IMPORTANT]
+> Don’t forget to use Sysprep to prepare the VM. If you miss that step, Azure can't provision a VM from the image.
 
 > [!NOTE]
-> You still incur some cost for storage of the image(s), but that incremental cost is likely insignificant compared to the manpower costs to rebuild the VM from scratch – for each person on your team who needs a VM.  For instance, it costs a few dollars to create and store a 127-GB image for a month that's reusable by all members of your team.  However, these costs are insignificant compared to hours each employee invests to build out and validate a properly configured dev box for thier individual use.
+> You still incur some cost for storage of the images, but that incremental cost can be insignificant compared to the overhead costs to rebuild the VM from scratch for each team member who needs one. For instance, it costs a few dollars to create and store a 127-GB image for a month that's reusable by your entire team. However, these costs are insignificant compared to hours each employee invests to build out and validate a properly configured dev box for their individual use.
 
-Additionally, your development tasks or technologies might need more scale – like varieties of development configurations and multiple machine configurations.  You can use Azure DevTest Labs to create _recipes_ that automate the construction of your ‘golden image,' and to manage policies for your team’s running VMs.  [Using Azure DevTest Labs for developers](https://docs.microsoft.com/en-us/azure/devtest-lab/devtest-lab-developer-lab) is the best source for more information on DevTest Labs.
+Additionally, your development tasks or technologies might need more scale, like varieties of development configurations and multiple machine configurations. You can use Azure DevTest Labs to create _recipes_ that automate construction of your "golden image." You can also use DevTest Labs to manage policies for your team’s running VMs. [Using Azure DevTest Labs for developers](/azure/devtest-lab/devtest-lab-developer-lab) is the best source for more information on DevTest Labs.
 
 ## Next steps
-Now that you know about the pre-configured Visual Studio images, the next step is to create a new VM:
+Now that you know about the preconfigured Visual Studio images, the next step is to create a new VM:
 
-* [Create a VM through the Azure portal](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-portal)
-* [Windows Virtual Machines overview](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/overview)
+* [Create a VM through the Azure portal](/azure/virtual-machines/windows/quick-create-portal)
+* [Windows Virtual Machines overview](/azure/virtual-machines/windows/overview)

docs/install/workload-and-component-ids.md

@@ -5,7 +5,7 @@ keywords:
 author: TerryGLee
 ms.author: tglee
 manager: ghogen
-ms.date: 10/09/2017
+ms.date: 03/05/2018
 ms.topic: article
 helpviewer_keywords: 
   - "workload ID, Visual Studio"