Merge pull request #4250 from MicrosoftDocs/master637080533534363510

ghogen · web-flow · commit fd8150a1144c · 2019-10-30T10:29:39.000-07:00
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/docs/debugger/debugger-tips-and-tricks.md b/docs/debugger/debugger-tips-and-tricks.md
@@ -134,6 +134,7 @@ If you need to debug the kinds of issues that are common to multithreaded apps,
 
     You can also view the location of threads in the [Parallel Stacks window](../debugger/get-started-debugging-multithreaded-apps.md).
 
+::: moniker range="vs-2017"
 ## Examine payloads for web services and network resources (UWP)
 
 In UWP apps, you can analyze network operations performed using the `Windows.Web.Http` API. You can use this tool to help debug web services and network resources. To use the tool, select **Debug > Performance Profiler**. Select **Network**, and then choose **Start**. In your app, go through the scenario that uses `Windows.Web.Http`, and then choose **Stop collection** to generate the report.
@@ -145,6 +146,7 @@ Select an operation in the summary view to view more details.
 ![Detailed information in the Network Usage tool](../profiling/media/prof-tour-network-usage-details.png "DetailedViewNetworkUsage")
 
 For more information, see [Network Usage](../profiling/network-usage.md).
+::: moniker-end
 
 ## <a name="modules_window"></a> Get more familiar with how the debugger attaches to your app (C#, C++, Visual Basic, F#)
 
diff --git a/docs/debugger/run-windows-store-apps-in-the-simulator.md b/docs/debugger/run-windows-store-apps-in-the-simulator.md
@@ -137,7 +137,9 @@ For more information about managing network connections, see:
 
 [Network information sample](https://code.msdn.microsoft.com/windowsapps/Network-Information-Sample-63aaa201)
 
+::: moniker range="vs-2017"
 [Analyze energy use](../profiling/analyze-energy-use-in-store-apps.md)
+::: moniker-end
 
 [Windows.Networking.Connectivity](/uwp/api/windows.networking.connectivity)
 
diff --git a/docs/profiling/analyze-energy-use-in-store-apps.md b/docs/profiling/analyze-energy-use-in-store-apps.md
@@ -13,6 +13,7 @@ ms.author: "mikejo"
 manager: jillfra
 ms.workload:
   - "uwp"
+monikerRange: vs-2017
 ---
 # Analyze energy use in UWP apps
 
diff --git a/docs/profiling/network-usage.md b/docs/profiling/network-usage.md
@@ -9,6 +9,7 @@ ms.author: "mikejo"
 manager: jillfra
 ms.workload:
   - "multiple"
+monikerRange: vs-2017
 ---
 # Analyze network usage in UWP apps
 The Visual Studio **Network** diagnostics tool collects data about network operations performed using the [Windows.Web.Http API](/uwp/api/windows.web.http). Analyzing the data can help you resolve issues like access and authentication problems, incorrect cache-use, and poor display and download performance.
diff --git a/docs/profiling/profiling-feature-tour.md b/docs/profiling/profiling-feature-tour.md
@@ -127,6 +127,7 @@ To diagnose UI responsiveness, slow loading time, and slow visual updates in UWP
 ![HTML UI Responsiveness profiling tool](../profiling/media/diaghtmlresp.png "DiagHTMLResp")
 ::: moniker-end
 
+::: moniker range="vs-2017"
 ## Analyze network usage (UWP)
 
 In UWP apps, you can analyze network operations performed using the `Windows.Web.Http` API.This tool may help you to resolve issues like access and authentication problems, incorrect cache-use, and poor display and download performance. To use the tool, choose **Network** in the Performance Profiler, and then choose **Start**. In your app, go through the scenario that uses `Windows.Web.Http`, and then choose **Stop collection** to generate the report.
@@ -138,6 +139,7 @@ Select an operation in the summary view to view more details.
 ![Detailed information in the Network Usage tool](../profiling/media/prof-tour-network-usage-details.png "Diag Network Usage Details")
 
 For more information, see [Network Usage](../profiling/network-usage.md).
+::: moniker-end
 
 ## Analyze performance (legacy tools)
 
@@ -149,6 +151,19 @@ If you need features such as instrumentation that are not currently present in C
 
 Here is a table that lists the different tools Visual Studio offers and the different project types you can use them with:
 
+::: moniker range=">=vs-2019"
+|Performance Tool|Windows desktop|UWP|ASP.NET/ASP.NET Core|
+|----------------------|---------------------|-------------|-------------|
+|[CPU Usage](../profiling/cpu-usage.md)|yes|yes|yes|
+|[Memory Usage](../profiling/memory-usage.md)|yes|yes|yes|
+|[GPU Usage](../debugger/gpu-usage.md)|yes|yes|no|
+|[Application Timeline](../profiling/application-timeline.md)|yes|yes|no|
+|[PerfTips](../profiling/perftips.md)|yes|yes for XAML, no for HTML|yes|
+|[Performance Explorer](../profiling/performance-explorer.md)|yes|no|yes|
+|[IntelliTrace](../debugger/intellitrace.md)|.NET with Visual Studio Enterprise only|.NET with Visual Studio Enterprise only|.NET with Visual Studio Enterprise only|
+::: moniker-end
+
+::: moniker range="vs-2017"
 |Performance Tool|Windows desktop|UWP|ASP.NET/ASP.NET Core|
 |----------------------|---------------------|-------------|-------------|
 |[CPU Usage](../profiling/cpu-usage.md)|yes|yes|yes|
@@ -161,6 +176,8 @@ Here is a table that lists the different tools Visual Studio offers and the diff
 |[Network Usage](../profiling/network-usage.md)|no|yes|no|
 |[HTML UI responsiveness](../profiling/html-ui-responsiveness.md)|no|yes for HTML, no for XAML|no|
 |[JavaScript Memory](../profiling/javascript-memory.md)|no|yes for HTML, no for XAML|no|
+::: moniker-end
+
 
 ## See also
 - [Debugging in Visual Studio](/visualstudio/debugger/debugger-feature-tour)
diff --git a/docs/vs-2015/debugger/run-windows-store-apps-in-the-simulator.md b/docs/vs-2015/debugger/run-windows-store-apps-in-the-simulator.md
@@ -80,7 +80,7 @@ The Visual Studio simulator for Windows Store apps is a desktop application that
  You can switch the device orientation between portrait and landscape by rotating the simulator 90 degrees in any direction.  
   
 > [!NOTE]
-> The simulator does not respect [DisplayProperties.AutoRotationPreferences](http://go.microsoft.com/fwlink/?LinkId=249460) property of a project. For example, if your project sets the orientation to `Landscape`, and you then rotate the simulator to a portrait orientation, the simulator display image will also be rotated and resized. Test these settings on an actual device.  
+> The simulator does not respect [DisplayProperties.AutoRotationPreferences](https://go.microsoft.com/fwlink/?LinkId=249460) property of a project. For example, if your project sets the orientation to `Landscape`, and you then rotate the simulator to a portrait orientation, the simulator display image will also be rotated and resized. Test these settings on an actual device.  
   
 > [!NOTE]
 > If you rotate the simulator so that one edge of the simulator is larger than the screen it is displayed on, the simulator is automatically resized to fit within the screen. The simulator is not resized to its original size if you rotate it again.  
@@ -132,10 +132,10 @@ The Visual Studio simulator for Windows Store apps is a desktop application that
   
    [Quickstart: Managing metered network cost constraints](https://msdn.microsoft.com/library/windows/apps/Hh750310.aspx)  
   
-   [Network information sample](http://code.msdn.microsoft.com/windowsapps/Network-Information-Sample-63aaa201)  
+   [Network information sample](https://code.msdn.microsoft.com/windowsapps/Network-Information-Sample-63aaa201)  
   
    [Analyze energy use](../profiling/analyze-energy-use-in-store-apps.md)  
-  
+    
    [Windows.Networking.Connectivity](https://msdn.microsoft.com/library/windows/apps/windows.networking.connectivity.aspx)  
   
    [How to respond to system events with background tasks](https://msdn.microsoft.com/f7c86e86-a7ae-4abb-a923-76b03337a80a)  
diff --git a/docs/vs-2015/profiling/analyze-cpu-usage-in-a-windows-universal-app.md b/docs/vs-2015/profiling/analyze-cpu-usage-in-a-windows-universal-app.md
@@ -21,7 +21,7 @@ robots: noindex,nofollow
 
 Applies to Windows and Windows Phone](../Image/windows_and_phone_content.png "windows_and_phone_content")  
   
- When you need to investigate performance issues in your app, a good place to start is understanding how it uses the CPU. The **CPU Usage** tool shows you where the CPU is spending time executing code. To focus on specific scenarios, CPU Usage can be run with the [XAML UI Responsiveness](https://msdn.microsoft.com/library/4ff84cd1-4e63-4fda-b34f-3ef862a6e480) tool, the [Energy Consumption](../profiling/analyze-energy-use-in-store-apps.md) tool, or both tools in a single diagnostic session.  
+ When you need to investigate performance issues in your app, a good place to start is understanding how it uses the CPU. The **CPU Usage** tool shows you where the CPU is spending time executing code. To focus on specific scenarios, CPU Usage can be run with the [XAML UI Responsiveness](https://msdn.microsoft.com/library/4ff84cd1-4e63-4fda-b34f-3ef862a6e480) tool, the [CPU Usage Tool](../profiling/cpu-usage.md) tool, or both tools in a single diagnostic session.  
   
 > [!NOTE]
 > The **CPU Usage** tool cannot be used with Windows Phone Silverlight 8.1 apps.  
diff --git a/subscriptions/vs-office365.md b/subscriptions/vs-office365.md
@@ -12,6 +12,9 @@ description:  Learn about the Office 365 benefit included in some Visual Studio
 
 Create your best work. Work anywhere with apps that are always updated. Office 365 ProPlus is a subscription that comes with premium apps like Word, Excel, PowerPoint, OneNote, Outlook, Publisher, and Access (Publisher and Access available on PC only). The apps can be installed on multiple devices, including PCs, Macs, iPads, iPhones, Android tablets, and Android phones. With a subscription, you get the latest versions of the apps and automatically receive updates when they happen.
 
+> [!NOTE]
+> Your Visual Studio subscription entitles you to use Office 365 for production use.  
+
 ## Getting started with Office 365 ProPlus
 
 Follow these steps to download and activate Office 365 ProPlus:
@@ -38,10 +41,6 @@ Follow these steps to download and activate Office 365 ProPlus:
 0. Click **Next** again.
 0. Click **Install** to install the Office applications.
 
-## Next steps
-
-If you're planning to develop applications for Office, you'll want to activate your [Office Developer Subscription](vs-office-dev.md)
-
 ## Eligibility
 
 | Subscription Level                                                 |     Channels                                            | Benefit                                                          | Renewable?    |
@@ -70,4 +69,5 @@ Not sure which subscription you're using?  Connect to [https://my.visualstudio.c
 Be sure to activate these great benefits to make the most of your Visual Studio subscription:
 - [Visual Studio](vs-ide-benefit.md)
 - [Azure DevOps](vs-azure-devops.md)
-- [Azure DevTest individual credit](vs-azure.md)
+- [Azure DevTest individual credit](vs-azure.md)
+If you're planning to develop applications for Office, you'll want to activate your [Office Developer Subscription](vs-office-dev.md)
