Merging changes synced from https://github.com/MicrosoftDocs/visualstudio-docs-pr (branch live)

Author: ghogen

docs/ide/default-keyboard-shortcuts-in-visual-studio.md

@@ -2,7 +2,7 @@
 title: Default keyboard shortcuts
 description: Learn about the default keyboard shortcuts in Visual Studio that allow you to access a variety of commands and windows.
 ms.custom: SEO-VS-2020
-ms.date: 06/21/2021
+ms.date: 08/11/2021
 ms.topic: reference
 helpviewer_keywords:
 - shortcut keys [Visual Studio], keyboard binding schemes
@@ -24,10 +24,16 @@ You can access a variety of [commands](reference/visual-studio-commands.md) and
 For a list of common keyboard shortcuts and other productivity information, see:
 
 - [Keyboard tips](../ide/productivity-shortcuts.md)
-- [Productivity tips](../ide/productivity-features.md).
+- [Productivity tips](../ide/productivity-features.md)
 
 For more information about accessibility in Visual Studio, see [Accessibility tips and tricks](../ide/reference/accessibility-tips-and-tricks.md) and [How to: Use the keyboard exclusively](../ide/reference/how-to-use-the-keyboard-exclusively.md).
 
+## Printable shortcut cheatsheet
+
+Click to get our [printable keyboard shortcut cheatsheet for Visual Studio](https://visualstudio.microsoft.com/keyboard-shortcuts.pdf).
+
+[:::image type="content" source="media/default-keyboard-shortcuts-in-visual-studio/visual-studio-keyboard-shortcut-cheatsheet.png" alt-text="Printable cheatsheet for keyboard shortcuts.":::](https://visualstudio.microsoft.com/keyboard-shortcuts.pdf)
+
 <a name="popular"></a>
 ## Popular keyboard shortcuts for Visual Studio
 
@@ -1474,6 +1480,3 @@ The shortcuts specific to this context are:
 |Show graph view|**Ctrl+3**| XsdDesigner.ShowGraphView |
 |Show start view|**Ctrl+1**| XsdDesigner.ShowStartView |
 
-## See also
-
-- [Visual Studio commands](reference/visual-studio-commands.md)

docs/ide/media/default-keyboard-shortcuts-in-visual-studio/visual-studio-keyboard-shortcut-cheatsheet.png

@@ -22,18 +22,6 @@ You can also start a feature suggestion directly from Visual Studio by choosing
 
 Choosing **Provide a Suggestion** takes you to [Developer Community](https://aka.ms/feedback/suggest?space=8), where you can enter your suggestion.
 
-## User Voice
-
-Until now, Visual Studio users proposed new feature ideas on User Voice. By adding the *Suggest a feature* functionality to Developer Community, all of your feedback for the Visual Studio product team is now in one place.
-
-The User Voice site has been made read-only. You can look back as you need to for context, but all new feature suggestions should be submitted on Developer Community.
-
-We migrated an initial set of ideas from the User Voice forum to Developer Community. Migration was done based on the community impact of the feedback and our product roadmap priorities. If you were expecting to see a suggestion here that we may have missed, feel free to add it to Developer Community.
-
-## Votes
-
-The voting system in Developer Community is different to User Voice. To maintain the integrity of Developer Community vote counts and to avoid skewing of votes, we show the User Voice vote counts prominently as a tag next to each feature suggestion. As you continue to vote on suggestions in the enhanced Developer Community, your new vote counts will show separately from the User Voice vote counts.
-
 ## Suggestion status
 
 After you submit a feature suggestion, states indicate where your feature submission is in its lifecycle. As we take your feedback into consideration and move it along the workflow, we tag it with the corresponding state. The various states associated with feature suggestions are listed here, along with a description of their meaning and color indicators.
@@ -103,32 +91,6 @@ Found the information we were looking for? You may request to reactivate the tic
 
 - - -
 
-## FAQ
-
-### Why can't I see my User Voice idea in Developer Community?
-
-New feature suggestions from the old User Voice forum have been migrated to Developer Community based on the impact to the broader community and our product road map priorities. If you think we've missed migrating your suggestion, add it as a new suggestion to Developer Community.
-
-### Why have the votes not been carried over from User Voice?
-
-The voting system in User Voice operates differently from the voting system in Developer Community. In the new system, we want to maintain the integrity of the vote counts and avoid skewing the data. We decided to show the User Voice vote counts prominently as a tag (instead of votes) for each suggestion. When users vote on suggest a feature submissions using Developer Community, the new votes will show separately from the User Voice votes.
-
-### Where can I see comments associated with the suggestions imported from User Voice?
-
-Follow the link we've included to go back to the User Voice comments on a suggestion that has been migrated to Developer Community. This link will be available during the transition period for easy reference if you need more context.
-
-### Why can I see three vote counts for a suggestion?
-
-When a suggestion has been imported from User Voice, you'll see three separate vote counts. The two vote counts shown as tags are the vote counts that the idea received originally on User Voice. The third vote count displayed to the left of the suggestion lets you see how many votes the suggestion is getting from Developer Community.
-
-The voting system in User Voice operates differently from the votes in Developer Community. To maintain integrity of Developer Community vote counts and avoid skewing the data, we decided to show the User Voice vote counts prominently as a tag (instead of votes) for each suggestion.
-
-### How long can I expect actions to take?
-
-We're fully committed to listening to your feature suggestions and taking actions to provide valuable experiences to our customers. Actions on suggestions are prioritized based on impact to the broader community. Even if we can't respond personally to every suggestion, we'll make sure that your feedback gets to the right team and is evaluated carefully.
-
-The response time depends on the status your feedback is in. Please review the explanation of statuses in this document to understand the response times.
-
 ## See also
 
 - [Introducing 'Suggest a Feature' in Developer Community (Visual Studio blog)](https://devblogs.microsoft.com/visualstudio/introducing-suggest-a-feature-in-developer-community/?utm_source=vs_developer_news&utm_medium=referral)

docs/ide/media/default-keyboard-shortcuts-in-visual-studio/visual-studio-shortcut-cheatsheet-extended.png

@@ -2,7 +2,7 @@
 title: MSBuild | Microsoft Docs
 description: Learn about how the Microsoft Build Engine (MSBuild) platform provides a project file with an XML schema to control builds.
 ms.custom: SEO-VS-2020
-ms.date: 11/04/2016
+ms.date: 08/11/2021
 ms.topic: conceptual
 helpviewer_keywords:
 - MSBuild, about MSBuild
@@ -65,6 +65,8 @@ MSBuild.exe MyProj.proj -property:Configuration=Debug
 
  MSBuild uses an XML-based project file format that's straightforward and extensible. The MSBuild project file format lets developers describe the items that are to be built, and also how they are to be built for different operating systems and configurations. In addition, the project file format lets developers author reusable build rules that can be factored into separate files so that builds can be performed consistently across different projects in the product.
 
+ The Visual Studio build system stores project-specific logic in the your project file itself, and uses imported MSBuild XML files with extensions like *.props* and *.targets* to define the standard build logic. The *.props* files define MSBuild properties, and *.targets* files define MSBuild targets. These imports are sometimes visible in the Visual Studio project file, but in newer projects such as .NET Core, .NET 5 and .NET 6 projects, you don't see the imports in the project file; instead, you see an SDK reference. These are called SDK-style projects. When you reference an SDK such as the .NET SDK, the imports of .props and .target files are implicitly specified by the SDK.
+
  The following sections describe some of the basic elements of the MSBuild project file format. For a tutorial about how to create a basic project file, see [Walkthrough: Creating an MSBuild project file from scratch](../msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch.md).
 
 ### <a name="BKMK_Properties"></a> Properties
@@ -161,9 +163,7 @@ MSBuild.exe MyProj.proj -property:Configuration=Debug
 
  These are some of the benefits of multitargeting:
 
-- You can develop applications that target earlier versions of .NET Framework, for example, versions 2.0, 3.0, and 3.5.
-
-- You can target frameworks other than .NET Framework, for example, Silverlight.
+- You can develop applications that target earlier versions of .NET Framework, for example, versions 3.5 and 4.7.2.
 
 - You can target a *framework profile*, which is a predefined subset of a target framework.
 

docs/ide/media/default-keyboard-shortcuts-in-visual-studio/visual-studio-shortcut-cheatsheet.png

@@ -2,7 +2,7 @@
 title: Get started with unit testing
 description: Use Visual Studio to define and run unit tests to maintain code health, and to find errors and faults before your customers do.
 ms.custom: SEO-VS-2020
-ms.date: 12/22/2020
+ms.date: 08/10/2021
 ms.topic: tutorial
 helpviewer_keywords:
 - unit testing, create unit test plans
@@ -17,16 +17,17 @@ ms.workload:
 
 Use Visual Studio to define and run unit tests to maintain code health, ensure code coverage, and find errors and faults before your customers do. Run your unit tests frequently to make sure your code is working properly.
 
-In this article, the code and illustrations use C#, but the concepts and features apply to .NET languages, C++, Python, JavaScript, and TypeScript.
+In this article, the code uses C# and C++, illustrations are in C#, but the concepts and features apply to .NET languages, C++, Python, JavaScript, and TypeScript.
 
 ## Create unit tests
 
 This section describes how to create a unit test project.
 
 1. Open the project that you want to test in Visual Studio.
 
-   For the purposes of demonstrating an example unit test, this article tests a simple "Hello World" C# project named **HelloWorldCore**. The sample code for such a project is as follows:
+   For the purposes of demonstrating an example unit test, this article tests a simple "Hello World" C# or C++ Console project named **HelloWorld** (**HelloWorldCore** in C#). The sample code for such a project is as follows:
 
+   ### [.NET](#tab/dotnet)
    ```csharp
    namespace HelloWorldCore
 
@@ -39,14 +40,25 @@ This section describes how to create a unit test project.
       }
    ```
 
+   ### [C++](#tab/cpp)
+   ```cpp
+   #include <iostream>
+
+   int main()
+   {
+      std::cout << "Hello World!\n";
+   }
+   ```
+   ---
+
 1. In **Solution Explorer**, select the solution node. Then, from the top menu bar, select **File** > **Add** > **New Project**.
 
-1. In the new project dialog box, find a unit test project template for the test framework you want to use, such as MSTest, and select it.
+1. In the new project dialog box, find a unit test project template for the test framework you want to use, such as MSTest (C#) or the **Native Unit Test** project (C++), and select it.
 
-   Starting in Visual Studio 2017 version 14.8, the .NET languages include built-in templates for NUnit and xUnit. For C++, you will need to select a test framework supported by the language. For Python, see [Set up unit testing in Python code](../python/unit-testing-python-in-visual-studio.md) to set up your test project.
+   Starting in Visual Studio 2017 version 14.8, the .NET languages include built-in templates for NUnit and xUnit. For C++, in this example select the **Native Unit Test** project, which uses Microsoft Native Unit Test Framework. (To use a different C++ test frameworks, see [Writing unit tests for C/C++](../test/writing-unit-tests-for-c-cpp.md)). For Python, see [Set up unit testing in Python code](../python/unit-testing-python-in-visual-studio.md) to set up your test project.
 
    > [!TIP]
-   > For C#, you can create unit test projects from code using a faster method. For more information, see [Create unit test projects and test methods](../test/unit-test-basics.md#create-unit-test-projects-and-test-methods). To use this method with .NET Core or .NET Standard, Visual Studio 2019 is required.
+   > For C# only, you can create unit test projects from code using a faster method. For more information, see [Create unit test projects and test methods](../test/unit-test-basics.md#create-unit-test-projects-and-test-methods). To use this method with .NET Core or .NET Standard, Visual Studio 2019 is required.
 
    The following illustration shows an MSTest unit test, which is supported in .NET.
 
@@ -78,7 +90,7 @@ This section describes how to create a unit test project.
 
 1. Add code to the unit test method.
 
-   For example, you might use the following code by selecting the correct documentation tab that matches your test framework: MSTest, NUnit, or xUnit (supported on .NET only).
+   For example, you might use the following code by selecting the correct documentation tab that matches your test framework: MSTest, NUnit, or xUnit (supported on .NET only), or C++ Microsoft Unit Testing Framework.
 
    ### [MSTest](#tab/mstest)
 
@@ -170,6 +182,44 @@ This section describes how to create a unit test project.
     }
     ```
 
+    ### [Microsoft Native Unit Test Framework](#tab/msunittest)
+
+    ```cpp
+    #include "pch.h"
+    #include "CppUnitTest.h"
+    #include "../HelloWorldUnitTestCPP/HelloWorldUnitTestCPP.cpp"   // Update using your project name
+
+    using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+    namespace HelloWorldTests
+    {
+       TEST_CLASS(HelloWorldTests)
+       {
+       public:
+
+          TEST_METHOD(TestMethod)
+          {
+             std::string expected = "Hello World!\n";
+
+             std::stringstream buffer;
+             std::streambuf* sbuf = std::cout.rdbuf(); // Save cout's buffer
+             std::cout.rdbuf(buffer.rdbuf()); // Redirect cout to the stringstream buffer
+
+             // Call main() in your test
+             int result = main();
+
+             // When finished, redirect cout to the original buffer 
+             std::cout.rdbuf(sbuf);
+             std::cout << "std original buffer: \n";
+             std::cout << buffer.get();
+
+             // Test
+             Assert::AreEqual(expected, buffer.str());
+          }
+       };
+    }
+    ```
+
     ---
 
 ## Run unit tests
@@ -199,7 +249,7 @@ This section describes how to create a unit test project.
 If you are using the MSTest, xUnit, or NUnit testing framework in Visual Studio 2017 or later, you can see live results of your unit tests.
 
 > [!NOTE]
-> To follow these steps, Visual Studio Enterprise is required.
+> To follow these steps, Visual Studio Enterprise is required, along with .NET code and one of the following test frameworks: MSTest, xUnit, or NUnit.
 
 1. Turn live unit testing from the **Test** menu by choosing **Test** > **Live Unit Testing** > **Start**.
 
@@ -227,13 +277,13 @@ For more information about live unit testing, see [Live unit testing](../test/li
 
 ## Use a third-party test framework
 
-You can run unit tests in Visual Studio by using third-party test frameworks such as Boost, Google, and NUnit, depending on your programming language. To use a third-party framework:
+You can run unit tests in Visual Studio by using third-party test frameworks such as NUnit, Boost, or Google C++ Testing Framework, depending on your programming language. To use a third-party framework:
 
 - Use the **NuGet Package Manager** to install the NuGet package for the framework of your choice.
 
 - (.NET) Starting in Visual Studio 2017 version 14.6, Visual Studio includes pre-configured test project templates for NUnit and xUnit test frameworks. The templates also include the necessary NuGet packages to enable support.
 
-- (C++) In Visual Studio 2017 and later versions, some frameworks like Boost are already included. For more information, see [Write unit tests for C/C++ in Visual Studio](../test/writing-unit-tests-for-c-cpp.md).
+- (C++) In Visual Studio 2017 and later versions, some frameworks like Google C++ Testing Framework are already included. For more information, see [Write unit tests for C/C++ in Visual Studio](../test/writing-unit-tests-for-c-cpp.md).
 
 To add a unit test project:
 
@@ -280,3 +330,6 @@ To add a unit test project:
 
 > [!div class="nextstepaction"]
 > [Create and run unit tests for managed code](walkthrough-creating-and-running-unit-tests-for-managed-code.md)
+
+> [!div class="nextstepaction"]
+> [Write unit tests for C/C++](../test/writing-unit-tests-for-c-cpp.md)