Merge branch 'master' of http://github.com/microsoftdocs/visualstudio-docs-pr into subscriptions

Author: Evan Windom

docs/debugger/diagnose-problems-after-deployment.md

@@ -1,7 +1,7 @@
 ---
 title: "Diagnose problems after deployment | Microsoft Docs"
 ms.custom: ""
-ms.date: "06/20/2017"
+ms.date: "04/10/2018"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: 
@@ -35,10 +35,6 @@ To diagnose issues in your ASP.NET web app after deployment by using IntelliTrac
  Set up your build process to create a build manifest (BuildInfo.config file) for your web project and include this manifest with your release. This manifest contains information about the project, source control, and build system that were used to create a specific build. This information helps Visual Studio find the matching source and symbols after you open the IntelliTrace log to review the recorded events.  
 
 ###  <a name="AutomatedBuild"></a> Create the build manifest for an automated build using Team Foundation Server  
-
- Follow these steps whether you use Team Foundation Version Control or Git.
-  
- **Step 2:** [Step 2: Release your app](#DeployRelease)  
 
  Follow these steps whether you use Team Foundation Version Control or Git.  
 
@@ -69,6 +65,8 @@ To diagnose issues in your ASP.NET web app after deployment by using IntelliTrac
      Anyone who can access your web server can see these locations in the build manifest. Make sure that your source server is secure.
 
 6.  Run a new build.  
+  
+    Go to [Step 2: Release your app](#DeployRelease)  
 
 ####  <a name="TFS2013"></a> Team Foundation Server 2013  
  Set up your build definition to add the locations of your source, build, and symbols to the build manifest (BuildInfo.config file). Team Foundation Build automatically creates this file and puts it in your project's output folder.  
@@ -113,7 +111,7 @@ To diagnose issues in your ASP.NET web app after deployment by using IntelliTrac
 
 6.  Run a new build.  
 
- **Step 2:** [Step 2: Release your app](#DeployRelease)  
+    Go to [Step 2: Release your app](#DeployRelease)  
 
 ####  <a name="TFS2012_2010"></a> Team Foundation Server 2012 or 2010  
  Follow these steps to automatically create the build manifest (BuildInfo.config file) for your project and put the file in your project's output folder. The file appears as "*ProjectName*.BuildInfo.config" in the output folder but is renamed "BuildInfo.config" in the deployment folder after you publish your app.  
@@ -138,7 +136,7 @@ To diagnose issues in your ASP.NET web app after deployment by using IntelliTrac
 
 4.  Run a new build.  
 
- **Step 2:** [Step 2: Release your app](#DeployRelease)  
+    Go to [Step 2: Release your app](#DeployRelease)  
 
 ###  <a name="ManualBuild"></a> Create the build manifest for a manual build using Visual Studio  
  Follow these steps to automatically create the build manifest (BuildInfo.config file) for your project and put the file in your project's output folder. The file appears as "*ProjectName*.BuildInfo.config" in the output folder but is renamed "BuildInfo.config" in the deployment folder after you publish your app.  
@@ -165,7 +163,7 @@ To diagnose issues in your ASP.NET web app after deployment by using IntelliTrac
 
 4.  Run a new build.  
 
- **Step 2:** [Step 2: Release your app](#DeployRelease)  
+    Go to [Step 2: Release your app](#DeployRelease)  
 
 ###  <a name="MSBuild"></a> Create the build manifest for a manual build using MSBuild.exe  
  Add these build arguments when you run a build:  

docs/ide/quickstart-python.md

@@ -117,7 +117,7 @@ You're now ready to add a bit of Python code to implement a minimal web app.
 
 **Question: Where can I learn more about Flask?**
 
-**Answer**: Refer to the Flask documentation, starting with the [Flask Quickstart](https://flask.pocoo.org/docs/0.12/quickstart/) (flask.pocoo.org).
+**Answer**: Refer to the Flask documentation, starting with the [Flask Quickstart](http://flask.pocoo.org/docs/0.12/quickstart/#quickstart) (flask.pocoo.org).
 
 ## Run the application
 

docs/install/visual-studio-build-numbers-and-release-dates.md

@@ -5,7 +5,7 @@ keywords:
 author: TerryGLee
 ms.author: tglee
 manager: douge
-ms.date: 04/09/2018
+ms.date: 04/10/2018
 ms.topic: reference
 helpviewer_keywords:
 ms.technology:
@@ -21,8 +21,9 @@ The following table lists the build numbers and release dates for Visual Studio
 
 | **Version**| **Channel** | **Release date** | **Build version** |
 | ---------------------- | ----------- | ---------------- | ----------------- |
+| 15.6.6 | Release | April 10, 2018 | 15.6.27428.2037 | 
 | 15.7.0 Preview 3.0 | Preview | April 9, 2018 | 15.7.27604.0 |
-| 15.6.5 | Release | April 4, 2018 | 15.6.27428.2027 | 
+| 15.6.5 | Release | April 4, 2018 | 15.6.27428.2027 |
 | 15.6.4 | Release | March 22, 2018 | 15.6.27428.2015 |
 | 15.7.0 Preview 2.0 | Preview | March 21, 2018 | 15.7.27520.0 |
 | 15.6.3 | Release | March 19, 2018 | 15.6.27428.2011 |

docs/msbuild/exec-task.md

@@ -48,7 +48,7 @@ Runs the specified program or command by using the specified arguments.
 |`WorkingDirectory`|Optional `String` parameter.<br /><br /> Specifies the directory in which the command will run.|  
 
 ## Remarks  
- This task is useful when a specific [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] task for the job that you want to perform is not available. However, the `Exec` task, unlike a more specific task, cannot gather output from the tool or command that it runs.  
+ This task is useful when a specific [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] task for the job that you want to perform is not available. However, the `Exec` task, unlike a more specific task, cannot do additional processing or conditional operations based on the result of the tool or command that it runs.
 
  The `Exec` task calls cmd.exe instead of directly invoking a process.  
 

docs/msbuild/getassemblyidentity-task.md

@@ -46,7 +46,6 @@ Retrieves the assembly identities from the specified files and outputs the ident
 
 ```xml  
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
-  
     <ItemGroup>  
         <MyAssemblies Include="File1.dll;File2.dll" />  
     </ItemGroup>  

docs/msbuild/target-build-order.md

@@ -109,6 +109,8 @@ Targets must be ordered if the input to one target depends on the output of anot
 2.  Targets specified on the command line by the **/target** switch are run. If you specify no targets on the command line, then the `DefaultTargets` targets are run. If neither is present, then the first target encountered is run.  
 
 3.  The `Condition` attribute of the target is evaluated. If the `Condition` attribute is present and evaluates to `false`, the target isn't executed and has no further effect on the build.
+
+    Targets that list the conditional target in `BeforeTargets` or `AfterTargets` still execute in the prescribed order
 
 4.  Before a target is executed, its `DependsOnTargets` targets are run.  
 

docs/porting/port-migrate-and-upgrade-visual-studio-projects.md

@@ -7,7 +7,7 @@ ms.suite:
 ms.technology:
   - "vs-ide-general"
 ms.tgt_pltfrm:
-ms.topic: "article"
+ms.topic: "conceptual"
 f1_keywords: 
   - "Win8ExpressDesktopBlock"
   - "w8trefactor"
@@ -20,7 +20,7 @@ helpviewer_keywords:
   - "projects, conversion"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "multiple"
 ---

docs/python/azure-sdk-for-python.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: kraigb
 ms.author: kraigb
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"
@@ -38,7 +38,7 @@ You can also follow [Install Python and the SDK](https://docs.microsoft.com/azur
 
 ## Documentation
 
-Documentation can be found on [azure-sdk-for-python.readthedocs.org](http://azure-sdk-for-python.readthedocs.org/en/latest/index.html).
+Documentation can be found on [azure-sdk-for-python.readthedocs.org](https://docs.microsoft.com/en-us/python/azure/?view=azure-python).
 
 The [Azure SDK for Python Developer Center](http://azure.microsoft.com/develop/python/) also has a number of helpful resources, including a number of tutorials:
 

docs/python/debugging-mixed-mode-c-cpp-python-in-visual-studio.md

@@ -1,6 +1,6 @@
 ---
 title: Mixed-mode debugging for Python | Microsoft Docs
-description: How to simultaneously debug C++ and Python in Visual Studio including stepping between environments, viewing values, and evaluting expressions.
+description: How to simultaneously debug C++ and Python in Visual Studio including stepping between environments, viewing values, and evaluating expressions.
 ms.custom:
 ms.date: 01/16/2018
 ms.reviewer:
@@ -14,7 +14,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/debugging-python-code-on-remote-linux-machines.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/debugging-python-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload:
   - "python"
   - "data-science"

docs/python/debugging-remote-python-code-on-azure-troubleshooting.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/debugging-remote-python-code-on-azure.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/debugging-symbols-for-mixed-mode-c-cpp-python.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/defining-custom-python-project-commands.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: kraigb
 ms.author: kraigb
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/editing-python-code-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload:
   - "python"
   - "data-science"

docs/python/formatting-python-code.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/includes/install-github-extension.md

@@ -1,4 +1,6 @@
+---
+ms.topic: "include"
+---
 1. To connect to GitHub repositories, run the Visual Studio installer, select **Modify**, and select the **Individual components** tab. Scroll down to the **Code tools** section, select **GitHub extension for Visual Studio**, and select **Modify**.
-    
+
     ![Selecting the GitHub extension in the Visual Studio installer](../media/installation-github-extension.png)
-    

docs/python/includes/project-from-existing.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 1. Launch Visual Studio and select **File > New > Project**.
 
 1. In the **New Project** dialog, search for "Python", select the "From Existing Python code" template, give the project a name and location, and select **OK**.

docs/python/installing-python-interpreters.md

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: ""
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/interactive-repl-ipython.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/linting-python-code.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/managing-python-environments-in-visual-studio.md

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: ""
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/managing-python-on-azure-app-service.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/managing-python-projects-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/managing-required-packages-with-requirements-txt.md

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: ""
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/overview-of-python-tools-for-visual-studio.md

@@ -170,14 +170,16 @@ A. Python is generally an interpreted language, with which code is run on demand
 Python features can be installed in the following editions of Visual Studio as described in the [installation guide](installing-python-support-in-visual-studio.md):
 
 - [Visual Studio 2017 (all editions)](https://www.visualstudio.com/vs/)
-- [Visual Studio 2015 (all editions)](https://www.visualstudio.com/downloads/visual-studio-2015-downloads-vs)
+- Visual Studio 2015 (all editions)
 - Visual Studio 2013 Community Edition
 - Visual Studio 2013 Express for Web, Update 2 or higher
 - Visual Studio 2013 Express for Desktop, Update 2 or higher
 - Visual Studio 2013 (Pro edition or higher)
 - Visual Studio 2012 (Pro edition or higher)
 - Visual Studio 2010 SP1 (Pro edition or higher; .NET 4.5 required)
 
+Visual Studio 2015 and earlier are available at [visualstudio.com/vs/older-downloads/](https://www.visualstudio.com/vs/older-downloads/).
+
 > [!Important]
 > Features are fully supported and maintained for only the latest version of Visual Studio. Features are available in older versions but are not actively maintained.
 

docs/python/profiling-python-code-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/publishing-python-web-applications-to-azure-from-visual-studio.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/python-azure-cloud-service-project-template.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/python-django-web-application-project-template.md

@@ -12,7 +12,7 @@ dev_langs:
 ms.tgt_pltfrm:
 ms.topic: "conceptual"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/python-environments-window-tab-reference.md

@@ -12,7 +12,7 @@ ms.tgt_pltfrm: ""
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload:
   - "python"
   - "data-science"

docs/python/python-interactive-repl-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.tgt_pltfrm:
 ms.topic: "conceptual"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"

docs/python/python-support-options-and-settings-in-visual-studio.md

@@ -21,7 +21,7 @@ f1_keywords:
   - "VS.ToolsOptionsPages.Text_Editor.Python.Advanced"
 author: "kraigb"
 ms.author: "kraigb"
-manager: ghogen
+manager: douge
 ms.workload: 
   - "python"
   - "data-science"