Merge pull request #7897 from MicrosoftDocs/master

ghogen · web-flow · commit 99b66b0f4ced · 2021-03-12T09:03:24.000-08:00
merge to live
diff --git a/docs/containers/container-tools.md b/docs/containers/container-tools.md
@@ -5,7 +5,7 @@ description: Learn how to use Visual Studio Container Tools and Docker for Windo
 ms.author: ghogen
 ms.date: 01/24/2020
 ms.technology: vs-azure
-ms.topic: include
+ms.topic: quickstart
 ---
 # Quickstart: Docker in Visual Studio
 
diff --git a/docs/containers/tutorial-multicontainer.md b/docs/containers/tutorial-multicontainer.md
@@ -6,7 +6,7 @@ ms.custom: SEO-VS-2020
 ms.author: ghogen
 ms.date: 01/10/2020
 ms.technology: vs-azure
-ms.topic: include
+ms.topic: tutorial
 ---
 # Tutorial: Create a multi-container app with Docker Compose
 
diff --git a/docs/get-started/csharp/tutorial-aspnet-core.md b/docs/get-started/csharp/tutorial-aspnet-core.md
@@ -351,7 +351,7 @@ Here's a quick FAQ to highlight some key concepts.
 
 ### What is C#?
 
-[C#](/dotnet/csharp/getting-started/introduction-to-the-csharp-language-and-the-net-framework) is a type-safe and object-oriented programming language that's designed to be both robust and easy to learn.
+[C#](https://docs.microsoft.com/dotnet/csharp/tour-of-csharp/) is a type-safe and object-oriented programming language that's designed to be both robust and easy to learn.
 
 ### What is ASP.NET Core?
 
diff --git a/docs/ide/git-with-visual-studio.md b/docs/ide/git-with-visual-studio.md
@@ -111,7 +111,7 @@ From both locations, you can switch between existing branches.
 
 ### Create a new branch
 
-You can also create a new branch. The equivalent command for this action is `git checkout <branchname>`.
+You can also create a new branch. The equivalent command for this action is `git checkout -b <branchname>`.
 
 Creating a new branch is as simple as entering the branch name and basing it off an existing branch.
 
diff --git a/docs/ide/using-regular-expressions-in-visual-studio.md b/docs/ide/using-regular-expressions-in-visual-studio.md
@@ -54,7 +54,7 @@ The following table contains some regular expression characters, operators, cons
 |Match any [whitespace character](/dotnet/standard/base-types/character-classes-in-regular-expressions#whitespace-character-s)|\s|`Public\sInterface` matches the phrase "Public Interface"|
 |Match any [decimal digit character](/dotnet/standard/base-types/character-classes-in-regular-expressions#decimal-digit-character-d)|\d|`\d` matches "4" and "0" in "wd40"|
 
-An example regular expression that combines some of the operators and constructs to match a hexadecimal number is `\b0[xX]([0-9a-fA-F]+\)\b`. This expression matches "0xc67f" but not "0xc67g".
+An example regular expression that combines some of the operators and constructs to match a hexadecimal number is `\b0[xX]([0-9a-fA-F]+)\b`. This expression matches "0xc67f" but not "0xc67g".
 
 > [!TIP]
 > In Windows operating systems, most lines end in "\r\n" (a carriage return followed by a new line). These characters aren't visible but are present in the editor and passed to the .NET regular expression service.
diff --git a/docs/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md b/docs/install/install-and-use-visual-studio-behind-a-firewall-or-proxy-server.md
@@ -135,6 +135,7 @@ To make sure that you have access to everything you want when you use Visual Stu
 | Debugger | 1. <br>vsdebugger.blob.core.windows.net <br>vsdebugger.azureedge.net <br><br>2. <br>download.visualstudio.com/\*/<br/>onecore.msvsmon.\*.zip<br><br> 3. referencesource.microsoft.com/symbols <br><br> 4. <br>symbols.nuget.org/download/symbols<br><br> 5. visualstudio.com<br><br>6. msdl.microsoft.com/download/symbols | https/443 | 1. <br>Used for downloading debugger bits for .NET Core debugging on Unix / macOS over SSH <br><br>2. <br>Used for downloading debugger bits for remote Windows Docker container debugging<br><br> 3. Used for .NET framework source stepping <br><br> 4. <br>(If user opts-in) Used for downloading symbols published to nuget.org symbol server.<br><br> 5. (If user opts-in) Used for downloading MS symbols and binaries, might also be needed for debugging managed code in dumps |
 | GitHub Codespaces| \*.online.visualstudio.com | https/443 | Used to call GitHub Codespaces APIs |
 | Xamarin Android App Publishing | \*.googleapis.com <br/> play.google.com <br/>accounts.google.com | https/443 | Used to interact with Google Play Store service to publish/upload Xamarin Android Applications directly from Visual Studio. |
+| Visual Studio Search Service | data-ai.microsoft.com/search | https/443 | Used to provide AI-enabled Visual Studio Search Service in `Ctrl+Q` search box |
 | Azure Container Registry | *.azurecr.io | https/443 | Access container registries hosted on Azure, for configuration of CICD pipelines |
 | | | | |
 
diff --git a/docs/test/configure-unit-tests-by-using-a-dot-runsettings-file.md b/docs/test/configure-unit-tests-by-using-a-dot-runsettings-file.md
@@ -300,7 +300,7 @@ These settings are specific to the test adapter that runs test methods that have
     <DeleteDeploymentDirectoryAfterTestRunIsComplete>False</DeleteDeploymentDirectoryAfterTestRunIsComplete>
     <DeploymentEnabled>False</DeploymentEnabled>
     <AssemblyResolution>
-      <Directory Path="D:\myfolder\bin\" includeSubDirectories="false"/>
+      <Directory path="D:\myfolder\bin\" includeSubDirectories="false"/>
     </AssemblyResolution>
 </MSTest>
 ```
@@ -316,7 +316,7 @@ These settings are specific to the test adapter that runs test methods that have
 |**DeleteDeploymentDirectoryAfterTestRunIsComplete**|true|To retain the deployment directory after a test run, set this value to **false**.|
 |**MapInconclusiveToFailed**|false|If a test completes with an inconclusive status, it is mapped to the skipped status in **Test Explorer**. If you want inconclusive tests to be shown as failed, set the value to **true**.|
 |**InProcMode**|false|If you want your tests to be run in the same process as the MSTest adapter, set this value to **true**. This setting provides a minor performance gain. But if a test exits with an exception, the remaining tests don't run.|
-|**AssemblyResolution**|false|You can specify paths to additional assemblies when finding and running unit tests. For example, use these paths for dependency assemblies that aren't in the same directory as the test assembly. To specify a path, use a **Directory Path** element. Paths can include environment variables.<br /><br />`<AssemblyResolution>  <Directory Path="D:\myfolder\bin\" includeSubDirectories="false"/> </AssemblyResolution>`|
+|**AssemblyResolution**|false|You can specify paths to additional assemblies when finding and running unit tests. For example, use these paths for dependency assemblies that aren't in the same directory as the test assembly. To specify a path, use a **Directory Path** element. Paths can include environment variables.<br /><br />`<AssemblyResolution>  <Directory path="D:\myfolder\bin\" includeSubDirectories="false"/> </AssemblyResolution>`|
 
 ## Example *.runsettings* file
 
diff --git a/docs/test/mstest-update-to-mstestv2.md b/docs/test/mstest-update-to-mstestv2.md
@@ -0,0 +1,109 @@
+---
+title: Update to MSTestV2
+description: Learn how to update from MSTestV1 to MSTestV2 
+ms.custom: SEO-VS-2020
+ms.date: 02/26/2021
+ms.topic: conceptual
+f1_keywords:
+- vs.UnitTest.Migrate
+author: mikejo5000
+ms.author: mikejo
+manager: jmartens
+ms.workload:
+- multiple
+---
+
+# Upgrade from MSTestV1 to MSTestV2
+
+You can upgrade your test project by retargeting the MSTest version referenced in your *.csproj* from the MSTestV1 to MSTestV2. Not all features in MSTestV1 were brought forward into MSTestV2, so some changes may be required to resolve errors. See [MSTestV1 features that are not supported in MSTestV2](#mstestv1-features-that-are-not-supported-in-mstestv2) to understand what features will no longer function. Some of these may need to be removed from your tests.
+
+1. Remove the assembly reference to Microsoft.VisualStudio.QualityTools.UnitTestFramework from your unit test project.
+2. Add NuGet package references to MSTestV2 including the [MSTest.TestFramework](https://www.nuget.org/packages/MSTest.TestFramework) and the [MSTest.TestAdapter](https://www.nuget.org/packages/MSTest.TestAdapter/) packages on nuget.org. You can install packages in the NuGet Package Manager Console with the following commands:
+
+    ```console
+    PM> Install-Package MSTest.TestAdapter -Version 2.1.2
+    PM> Install-Package MSTest.TestFramework -Version 2.1.2
+    ```
+
+### Old style csproj example
+
+Sample *.csproj* targeting MSTestV1:
+
+```xml
+<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+  <Private>False</Private>
+</Reference>
+```
+
+Sample *.csproj* now targeting MSTestV2:
+
+```xml
+<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+  <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+</Reference>
+```
+
+> [!NOTE]
+> Test projects that are Coded UI tests or Web Load Tests are not compatible with MSTestV2. These project types have been deprecated. Read more on [Coded UI Test deprecation](https://devblogs.microsoft.com/devops/changes-to-coded-ui-test-in-visual-studio-2019/) and [Web Load Test deprecation](https://devblogs.microsoft.com/devops/cloud-based-load-testing-service-eol/).
+
+### SDK-style csproj (.NET Core and .NET 5)
+
+If your *.csproj* is the newer SDK-style *.csproj* you're most likely already using MSTestV2. You can find the NuGet packages for [MSTestV2](https://www.nuget.org/packages/MSTest.TestFramework) and the [MSTestV2 Adapter](https://www.nuget.org/packages/MSTest.TestAdapter/) on NuGet.
+
+Example:
+
+```xml
+<ItemGroup>
+  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+  <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
+  <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+</ItemGroup>
+```
+
+## Why Upgrade to MSTestV2?
+
+In 2016, we released the next step in evolving the MSTest framework with MSTestV2. You can read more about this change in the announcement [blog post](https://devblogs.microsoft.com/devops/taking-the-mstest-framework-forward-with-mstest-v2/).
+
+* MSTestV2 is more easily acquired and updated because it's delivered as a [NuGet Package](https://www.nuget.org/packages/MSTest.TestFramework/).
+* MSTestV2 is [open source](https://github.com/microsoft/testfx).
+* Uniform app-platform support – MSTestV2 is a converged implementation that offers uniform app-platform support across .NET Framework, .NET Core, ASP.NET Core, and UWP. [Read more](https://blogs.msdn.microsoft.com/devops/2016/09/01/announcing-mstest-v2-framework-support-for-net-core-1-0-rtm/).
+* The implementation is fully cross platform (Windows, Linux, Mac). [Read more](https://blogs.msdn.microsoft.com/devops/2017/04/05/mstest-v2-is-open-source/).
+* MSTestV2 supports targeting .NET Framework 4.5.0 and later, .NET Core 1.0 and later (Universal Windows Apps 10+), ASP.NET Core 1.0 and later, and .NET 5 and later.
+* Provides a uniform, single end-user extensibility mechanism. [Read more](https://blogs.msdn.microsoft.com/devops/2017/07/18/extending-mstest-v2/).
+* Provides a uniform `DataRow` support for all MSTest based test projects. [Read more](https://blogs.msdn.microsoft.com/devops/2017/02/25/mstest-v2-now-and-ahead/).
+* Enables placing the `TestCategory` attribute at the level of a class or assembly. [Read more](https://blogs.msdn.microsoft.com/devops/2017/02/25/mstest-v2-now-and-ahead/).
+* Test methods from base classes defined in another assembly are now discovered and run from the derived Test class. This change brings in a consistent behavior with derived test class types. If this behavior isn't required for compatibility reasons, it can be changed back using the following run settings:
+
+    ```xml
+    <RunSettings>    
+    <MSTest> 
+      <EnableBaseClassTestMethodsFromOtherAssemblies>false</EnableBaseClassTestMethodsFromOtherAssemblies> 
+    </MSTest> 
+    </RunSettings>
+    ```
+
+* Provides finer-grained control over parallel execution via [in-assembly parallel execution](https://github.com/Microsoft/testfx-docs/blob/master/RFCs/004-In-Assembly-Parallel-Execution.md) of tests. This enables running tests within an assembly in parallel.
+* The `TestCleanup` method on a `TestClass` is invoked even if its corresponding `TestInitialize` method fails. [Issue details](https://github.com/Microsoft/testfx/issues/250).
+* The time taken by `AssemblyInitialize` and `ClassInitialize` isn't counted towards the test duration. This change limits their impact on a test timing out.
+* Tests that aren't runnable can be configured to be marked as failed via the `MapNotRunnableToFailed` tag, which is part of the adapter node in the `.runsettings` file.
+
+    ```xml
+    <RunSettings>    
+    <MSTest> 
+      <MapNotRunnableToFailed>true</MapNotRunnableToFailed> 
+    </MSTest> 
+    </RunSettings>
+    ```
+
+## MSTestV1 features that are not supported in MSTestV2
+
+*	Tests cannot be included into an "Ordered Test".
+*	The adapter doesn't support being configured via a *.testsettings* file. Use the new [*.runsettings* file](../test/configure-unit-tests-by-using-a-dot-runsettings-file.md) for test run configuration.
+*	The adapter doesn't support test lists specified as a *.vsmdi* file.
+*	The "Coded UI Test Project" and the "Web Performance and Load Test Project" types are not supported. Read more on [Coded UI Test deprecation](https://devblogs.microsoft.com/devops/changes-to-coded-ui-test-in-visual-studio-2019/) and [Web Load Test deprecation](https://devblogs.microsoft.com/devops/cloud-based-load-testing-service-eol/).
+
+## See also
+
+- [Configure test runs with `.runsettings`](../test/configure-unit-tests-by-using-a-dot-runsettings-file.md)
+- [Unit test your code](../test/unit-test-your-code.md)
+- [Debug unit tests with Test Explorer](../test/debug-unit-tests-with-test-explorer.md)
diff --git a/docs/test/toc.yml b/docs/test/toc.yml
@@ -119,6 +119,10 @@
       href: customizing-code-coverage-analysis.md
     - name: Troubleshoot code coverage
       href: troubleshooting-code-coverage.md
+  - name: Migration
+    items:
+    - name: Upgrade from MSTestV1 to MSTestV2
+      href: mstest-update-to-mstestv2.md
 - name: Live Unit Testing
   items:
   - name: Introduction
