Merge branch 'master' of github.com:MicrosoftDocs/visualstudio-docs-pr into tglee-vsinstall

Author: tglee

.openpublishing.redirection.json

@@ -2020,6 +2020,16 @@
             "redirect_url": "/visualstudio/test/run-unit-tests-with-test-explorer",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/test/test-windows-store-8-1-apps-with-coded-ui-tests.md",
+            "redirect_url": "/visualstudio/test/test-uwp-app-with-coded-ui-test",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/test/test-windows-phone-8-1-apps-with-coded-ui-tests.md",
+            "redirect_url": "/visualstudio/test/test-uwp-app-with-coded-ui-test",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/test/testing-store-apps-with-visual-studio.md",
             "redirect_url": "/visualstudio/test/create-and-run-unit-tests-for-a-store-app-in-visual-studio/",

docs/debugger/how-to-set-debug-and-release-configurations.md

@@ -55,7 +55,7 @@ You can change the build configuration from the **Build** menu, from the toolbar
 
      This toolbar is not available in Express editions. You can use the **Build Solution F6** and **Start Debugging F5** menu items to choose the configuration.
 
-## <a name="BKMK_symbols_release"></a>Generate symbol (.pbd) files for a build
+## <a name="BKMK_symbols_release"></a>Generate symbol (.pdb) files for a build
 
 For most project types, the .pdb files are generated by default for both debug and release builds, but the default settings are different depending on your specific project type and the version of Visual Studio. You can configure whether the compiler generates .pdb files and what kind of debug information to include.
 
@@ -112,4 +112,4 @@ For detailed information on project settings for debug configurations in C#, see
  [Project Settings for a C++ Debug Configuration](../debugger/project-settings-for-a-cpp-debug-configuration.md)   
  [Project Settings for  C# Debug Configurations](../debugger/project-settings-for-csharp-debug-configurations.md)   
  [Project Settings for a Visual Basic Debug Configuration](../debugger/project-settings-for-a-visual-basic-debug-configuration.md)   
- [How to: Create and Edit Configurations](../ide/how-to-create-and-edit-configurations.md)
+ [How to: Create and Edit Configurations](../ide/how-to-create-and-edit-configurations.md)

docs/ide/create-a-visual-basic-winform-in-visual-studio.md

@@ -20,7 +20,7 @@ ms.workload:
 
 In this short introduction to the Visual Studio integrated development environment (IDE), you'll create a simple Visual Basic application that has a Windows-based user interface (UI).
 
-If you haven't already installed Visual Studio, go to the [Visual Studio Downloads](https://aka.ms/vsdownload?utm_source=mscom&utm_campaign=msdocs) page to install it for free.
+If you haven't already installed Visual Studio, go to the [Visual Studio Downloads](https://www.visualstudio.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=button+cta&utm_content=download+vs2017) page to install it for free.
 
 ## Create a project
 

docs/ide/visual-studio-experience-improvement-program.md

@@ -16,6 +16,8 @@ ms.workload:
 
 The Visual Studio Customer Experience Improvement Program (VSCEIP) is designed to help Microsoft improve Visual Studio over time. This program [collects information about errors](../ide/diagnostic-data-collection.md), computer hardware, and how people use Visual Studio, without interrupting users in their tasks at the computer. The information that's collected helps Microsoft identify which features to improve. This document covers how to opt in or out of the VSCEIP.
 
+[!INCLUDE [gdpr-hybrid-note](../misc/includes/gdpr-hybrid-note.md)]
+
 ## Opt in or out
 
 The VSCEIP is turned on by default. You can turn it off, or back on again, by following these instructions:
@@ -35,13 +37,13 @@ The VSCEIP is turned on by default. You can turn it off, or back on again, by fo
 
 If you install the [Build Tools for Visual Studio](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017), you must update the registry to configure the VSCEIP. Enterprise customers can construct a group policy to opt in or out of the VSCEIP by setting a registry-based policy.
 
-[!INCLUDE [gdpr-hybrid-note](../misc/includes/gdpr-hybrid-note.md)]
-
 The relevant registry key and settings are as follows:
 
-Key = **HKEY_CURRENT_USER\SOFTWARE\Microsoft\VSCommon\15.0\SQM**
+On a 64-bit OS, Key = **HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VSCommon\15.0\SQM**  
+On a 32-bit OS, Key = **HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VSCommon\15.0\SQM**  
+When Group Policy is enabled, Key = **HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\VisualStudio\SQM**  
 
-Entry = OptIn
+Entry = **OptIn**
 
 Value = (DWORD)
 - **0** is opted out (turn off the VSCEIP)
@@ -58,4 +60,4 @@ For more information about the information collected, processed, or transmitted
 * [Talk to us](../ide/talk-to-us.md)
 * [How to report a problem with Visual Studio](../ide/how-to-report-a-problem-with-visual-studio-2017.md)
 * [Visual Studio Developer Community](https://developercommunity.visualstudio.com/)
-* [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement)
+* [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement)

docs/products/index.md

@@ -54,6 +54,25 @@ searchScope: []
                                     </div>
                                 </a>
                             </li>
+                            <li>
+                                <a href="https://docs.microsoft.com/tfs" title="Team Foundation Server">
+                                    <div class="cardSize">
+                                        <div class="cardPadding">
+                                            <div class="card">
+                                                <div class="cardImageOuter">
+                                                    <div class="cardImage">
+                                                        <img data-scaleimage="./images/vs-team-services.svg" src="./images/vs-team-services.svg" alt="" />
+                                                    </div>
+                                                </div>
+                                                <div class="cardText">
+                                                    <h3>Team Foundation Server</h3>
+                                                    <p>Install, upgrade, and manage your on-premises deployments.</p>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </li>
                             <li>
                                 <a href="https://code.visualstudio.com/docs" title="Visual Studio Code">
                                     <div class="cardSize">
@@ -130,7 +149,7 @@ searchScope: []
                                     </div>
                                 </a>
                             </li>
-                        </ul>						
+                        </ul>
                     </li>
                 </ul>
             </li>

docs/python/learn-django-in-visual-studio-step-06-polls-django-web-project-template.md

@@ -249,7 +249,7 @@ urlpatterns = [
 ]
 ```
 
-If you're not familiar with the more complex regular expressions used here, you can paste the expression into [regex101.com](https://regex101.com/) for an explanation in plain language. (You'll need to escape the forward slashes `/` by adding a back slash, `\`h before them; escaping isn't necessary in Python because of the `r` prefix on the string, meaning "raw").
+If you're not familiar with the more complex regular expressions used here, you can paste the expression into [regex101.com](https://regex101.com/) for an explanation in plain language. (You'll need to escape the forward slashes `/` by adding a back slash, `\` before them; escaping isn't necessary in Python because of the `r` prefix on the string, meaning "raw").
 
 In Django, the syntax `?P<name>pattern` creates a group named `name`, which gets passed as arguments to views in the order they appear. In the code shown earlier, `PollsDetailView` and `PollsResultsView` receive an argument named `pk` and `app.views.vote` receives an argument named `poll_id`.
 

docs/test/creating-a-data-driven-coded-ui-test.md

@@ -4,26 +4,27 @@ ms.date: 11/04/2016
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-test
 ms.topic: conceptual
-helpviewer_keywords: 
+helpviewer_keywords:
   - "coded UI tests, data-driven"
 author: gewarren
 ms.author: gewarren
 manager: douge
-ms.workload: 
+ms.workload:
   - "multiple"
 ---
-# Creating a Data-Driven Coded UI Test
+# Create a Data-Driven Coded UI Test
 
 To test different conditions, you can run your tests multiple times with different parameter values. Data-driven coded UI tests are a convenient way to do this. You define parameter values in a data source, and each row in the data source is an iteration of the coded UI test. The overall result of the test will be based on the outcome for all the iterations. For example, if one test iteration fails, the overall test result is failure.
 
- **Requirements**
+**Requirements**
 
--   Visual Studio Enterprise
+- Visual Studio Enterprise
 
 ## Create a data-driven coded UI test
- This sample creates a coded UI test that runs on the Windows Calculator application. It adds two numbers together and uses an assertion to validate that the sum is correct. Next, the assertion and the parameter values for the two numbers are coded to become data-driven and stored in a comma-separated value (.csv) file.
 
-#### Step 1 - Create a coded UI test
+This sample creates a coded UI test that runs on the Windows Calculator application. It adds two numbers together and uses an assertion to validate that the sum is correct. Next, the assertion and the parameter values for the two numbers are coded to become data-driven and stored in a comma-separated value (.csv) file.
+
+### Step 1 - Create a coded UI test
 
 1.  Create a project.
 
@@ -87,7 +88,7 @@ To test different conditions, you can run your tests multiple times with differe
 
      At this point, all the parameter values are defined in their methods as constants. Next, let's create a data set to make our test data-driven.
 
-#### Step 2 - Create a data set
+### Step 2 - Create a data set
 
 1.  Add a text file to the dataDrivenSample project named `data.csv`.
 
@@ -113,7 +114,7 @@ To test different conditions, you can run your tests multiple times with differe
 
      Now that we have the data set created, let's bind the data to the test.
 
-#### Step 3 - Add data source binding
+### Step 3 - Add data source binding
 
 1.  To bind the data source, add a `DataSource` attribute within the existing `[TestMethod]` attribute that is immediately above the test method.
 
@@ -140,7 +141,7 @@ To test different conditions, you can run your tests multiple times with differe
 
      Next, we'll configure the test to use the values in the data source file.
 
-#### Step 4 - Use the data in the coded UI test
+### Step 4 - Use the data in the coded UI test
 
 1.  Add `using Microsoft.VisualStudio.TestTools.UITesting.WinControls` to the top of the CodedUITest.cs file:
 
@@ -189,7 +190,7 @@ To test different conditions, you can run your tests multiple times with differe
 
 3.  Save the solution.
 
-#### Step 5 - Run the data-driven test
+### Step 5 - Run the data-driven test
 
 1.  Verify that the test is now data-driven by running the test again.
 
@@ -202,9 +203,10 @@ To test different conditions, you can run your tests multiple times with differe
 ## Q & A
 
 ###  <a name="CreateDataDrivenCUIT_QA_DataSourceAttributes"></a> What are the data source attributes for other data source types, such as SQL Express or XML?
- You can use the sample data source strings in the table below by copying them to your code and making the necessary customizations.
 
- **Data Source Types and Attributes**
+You can use the sample data source strings in the table below by copying them to your code and making the necessary customizations.
+
+**Data Source Types and Attributes**
 
 -   CSV
 
@@ -226,20 +228,9 @@ To test different conditions, you can run your tests multiple times with differe
 
      `[DataSource("System.Data.SqlClient", "Data Source=.\\sqlexpress;Initial Catalog=tempdb;Integrated Security=True", "Data", DataAccessMethod.Sequential), TestMethod]`
 
-### Q: Can I use data-driven tests on my Windows Phone app?
- **A:** Yes. Data-driven Coded UI tests for Windows Phone are defined using the DataRow attribute on a test method. In the following example, x and y use the values of 1 and 2 for the first iteration and -1 and -2 for the second iteration of the test.
-
-```csharp
-[DataRow(1, 2, DisplayName = "Add positive numbers")]
-[DataRow(-1, -2, DisplayName = "Add negative numbers")]
-[TestMethod]
-public void DataDrivingDemo_MyTestMethod(int x, int y)
-```
-
-For more information, see [Use Data-driven coded UI tests on Windows Phone apps](../test/test-windows-phone-8-1-apps-with-coded-ui-tests.md#TestingPhoneAppsCodedUI_DataDriven).
-
 ### Q: Why can't I modify the code in the UIMap.Designer file?
- **A:** Any code changes you make in the UIMapDesigner.cs file will be overwritten every time you generate code using the UIMap - Coded UI Test Builder. In this sample, and in most cases, the code changes needed to enable a test to use a data source can be made to the test's source code file (that is, CodedUITest1.cs).
+
+**A:** Any code changes you make in the UIMapDesigner.cs file will be overwritten every time you generate code using the UIMap - Coded UI Test Builder. In this sample, and in most cases, the code changes needed to enable a test to use a data source can be made to the test's source code file (that is, CodedUITest1.cs).
 
 If you have to modify a recorded method, you must copy it to UIMap.cs file and rename it. The UIMap.cs file can be used to override methods and properties in the UIMapDesigner.cs file. You must remove the reference to the original method in the Coded UITest.cs file and replace it with the renamed method name.
 

docs/test/developer-testing-scenarios.md

@@ -4,11 +4,11 @@ ms.date: 05/02/2017
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-test
 ms.topic: conceptual
-helpviewer_keywords: 
+helpviewer_keywords:
   - "unit testing, create unit tests"
 ms.author: gewarren
 manager: douge
-ms.workload: 
+ms.workload:
   - "multiple"
 author: gewarren
 ---
@@ -54,8 +54,7 @@ need.
 
 * [Use UI Automation To Test Your Code](use-ui-automation-to-test-your-code.md)
 * [Get started creating, editing and maintaining a coded UI test](walkthrough-creating-editing-and-maintaining-a-coded-ui-test.md)
-* [Test UWP apps with Coded UI Tests](test-windows-store-8-1-apps-with-coded-ui-tests.md)
-* [Test Windows Phone Apps with Coded UI Tests](test-windows-phone-8-1-apps-with-coded-ui-tests.md)
+* [Test UWP apps with Coded UI Tests](test-uwp-app-with-coded-ui-test.md)
 * [Test SharePoint Applications with Coded UI Tests](testing-sharepoint-2010-applications-with-coded-ui-tests.md)
 * [Introduction to Coded UI Tests with Visual Studio Enterprise (Lab)](http://download.microsoft.com/download/6/2/B/62B60ECE-B9DC-4E8A-A97C-EA261BFB935E/Docs/Introduction%20to%20Coded%20UI%20Tests%20with%20Visual%20Studio%20Enterprise%202015.docx)
 

docs/test/extending-coded-ui-tests-and-action-recordings-to-support-microsoft-excel.md

@@ -12,7 +12,9 @@ author: gewarren
 ---
 # Extend Coded UI Tests and Action Recordings to Support Microsoft Excel
 
-The testing framework for coded UI tests and action recordings does not support every possible user interface. It might not support the specific UI that you want to test. For example, you cannot immediately create a coded UI test or an action recording for a [!INCLUDE[ofprexcel](../test/includes/ofprexcel_md.md)] spreadsheet. However, you can create your own extension to the coded UI test framework that will support your specific UI by taking advantage of the extensibility of the coded UI test framework. The following topic gives an example of how to extend the framework to support the creation of coded UI tests and action recordings for [!INCLUDE[ofprexcel](../test/includes/ofprexcel_md.md)]. For more information about the platforms that are supported, see [Supported Configurations and Platforms for Coded UI Tests and Action Recordings](../test/supported-configurations-and-platforms-for-coded-ui-tests-and-action-recordings.md).
+The testing framework for coded UI tests and action recordings does not support every possible user interface. It might not support the specific UI that you want to test. For example, you cannot immediately create a coded UI test or an action recording for a Microsoft Excel spreadsheet. However, you can create your own extension to the coded UI test framework that supports your specific UI by taking advantage of the extensibility of the coded UI test framework.
+
+This article gives an example of how to extend the framework to support the creation of coded UI tests and action recordings for Microsoft Excel. For more information about the platforms that are supported, see [Supported Configurations and Platforms for Coded UI Tests and Action Recordings](../test/supported-configurations-and-platforms-for-coded-ui-tests-and-action-recordings.md).
 
 This section presents a coded UI test extension that can record and play back tests of Excel Worksheets. Each part of the extension is explained in this section and in the code comments for developers who want to create just such an extension.
 
@@ -40,9 +42,10 @@ Get the sample from this [blog post](https://blogs.msdn.microsoft.com/gautamg/20
 The following sections provide information about the sample and its structure.
 
 ### Microsoft Excel Add-in: ExcelCodedUIAddinHelper
- This project includes an add-in that runs in the Excel process. See [Sample Excel Add-In for Coded UI Testing](../test/sample-excel-add-in-for-coded-ui-testing.md) for a brief overview of the add-in project.
 
- For more information, see [Walkthrough: Creating Your First VSTO Add-in for Excel](http://msdn.microsoft.com/Library/a855e2be-3ecf-4112-a7f5-ec0f7fad3b5f).
+This project includes an add-in that runs in the Excel process. See [Sample Excel Add-In for Coded UI Testing](../test/sample-excel-add-in-for-coded-ui-testing.md) for a brief overview of the add-in project.
+
+For more information, see [Walkthrough: Creating Your First VSTO Add-in for Excel](http://msdn.microsoft.com/Library/a855e2be-3ecf-4112-a7f5-ec0f7fad3b5f).
 
 ### Excel UI communication: ExcelUIcommunicationHelper
  This project includes the `IExcelUICommunication` interface and the information classes that are used to pass data between the Coded UI Testing Framework and Excel. For more information, see [Sample Excel Communicator Interface](../test/sample-excel-communicator-interface.md).