Merge pull request #10537 from MicrosoftDocs/main638699945177655426sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

docs/test/customizing-code-coverage-analysis.md

@@ -115,8 +115,6 @@ You can also specify different formats from the command-line by either specifyin
 
 In Visual Studio 2022 version 17.2, we added the option to instrument native binary statically (on disk). In previous versions, we supported only dynamic instrumentation, which was often not able to instrument methods. Static native instrumentation is more stable and it is recommended. Static native instrumentation requires enabling the [/PROFILE](/cpp/build/reference/profile-performance-tools-profiler) link option for all native projects for which you need code coverage collection. 
 
-You can enable native static instrumentation by enabling the preview feature **Code Coverage native static instrumentation** in  **Tools > Options > Environment > Preview Features**.
-
 You can also enable native static instrumentation in runsettings by adding `<EnableStaticNativeInstrumentation>True</EnableStaticNativeInstrumentation>` under `<CodeCoverage>` tag. Use this method for command line scenarios.
 
 By default, dynamic native instrumentation is always enabled. If both static and dynamic instrumentation is enabled, Visual Studio tries to instrument your C++ code statically, but if this is not possible (for example, when the `/PROFILE` link option is not enabled), dynamic instrumentation will be used. You can fully disable dynamic native instrumentation in runsettings by adding `<EnableDynamicNativeInstrumentation>False</EnableDynamicNativeInstrumentation>` under `<CodeCoverage>`.
@@ -198,6 +196,7 @@ For more information about regular expressions, see [Use regular expressions in
 Copy this code and edit it to suit your needs.
 
 ::: moniker range=">=vs-2022"
+
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <!-- File name extension must be .runsettings -->
@@ -207,6 +206,7 @@ Copy this code and edit it to suit your needs.
       <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
         <Configuration>
           <CodeCoverage>
+            <Format>coverage</Format>
 <!--
 Additional paths to search for .pdb (symbol) files. Symbols must be found for modules to be instrumented.
 If .pdb files are in the same folder as the .dll or .exe files, they are automatically found. Otherwise, specify them here.
@@ -322,9 +322,11 @@ Included items must then not match any entries in the exclude list to remain inc
   </DataCollectionRunSettings>
 </RunSettings>
 ```
+
 ::: moniker-end
 
 ::: moniker range="vs-2019"
+
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <!-- File name extension must be .runsettings -->
@@ -443,6 +445,7 @@ Included items must then not match any entries in the exclude list to remain inc
   </DataCollectionRunSettings>
 </RunSettings>
 ```
+
 ::: moniker-end
 
 ## Related content

docs/test/microsoft-code-coverage-console-tool.md

@@ -21,10 +21,10 @@ Microsoft.CodeCoverage.Console is available in Visual Studio 2022 17.3 under the
 ```console
 C:\Program Files\Microsoft Visual Studio\2022\Enterprise> Microsoft.CodeCoverage.Console --help
 Description:
-  Dynamic code coverage tools.
+  Code coverage tools.
 
 Usage:
-  codecoverage [command] [options]
+  Microsoft.CodeCoverage.Console [command] [options]
 
 Options:
   --version       Show version information
@@ -37,13 +37,13 @@ Commands:
   merge <files>                       Merge coverage reports
   shutdown <session>                  Close existing code coverage collection.
   snapshot <session>                  Creates coverage file for existing code coverage collection.
-  instrument <input-file>             Instruments native binary.
-
+  instrument <input-file>             Instruments native and managed binary.
+  uninstrument <input-file>           Restore original binary.
 ```
 
-## Collect, connect, shutdown, merge and snapshot commands
+## Collect, connect, shutdown, merge, snapshot, and uninstrument commands
 
-The Microsoft.CodeCoverage.Console tool is extension to the [dotnet-coverage](/dotnet/core/additional-tools/dotnet-coverage) dotnet tool. The documentation for collect, connect, shutdown, merge, and snapshot commands can be found [here](/dotnet/core/additional-tools/dotnet-coverage).
+The Microsoft.CodeCoverage.Console tool is extension to the [dotnet-coverage](/dotnet/core/additional-tools/dotnet-coverage) dotnet tool. The documentation for collect, connect, shutdown, merge, snapshot, and uninstrument commands can be found [here](/dotnet/core/additional-tools/dotnet-coverage).
 
 Microsoft.CodeCoverage.Console supports additional security features to enable collecting ASP.NET code coverage data from IIS. Additionally, the Microsoft.CodeCoverage.Console tool supports collecting code coverage for C++ code. The `instrument` command is specific to these scenarios.
 
@@ -55,10 +55,12 @@ The instrument command is used to instrument native or managed binary on disk.
 
 ```console
 Microsoft.CodeCoverage.Console instrument
-    [-s|--settings <settings>] [-id|--session-id <session-id>]
-    [-o|--output <output>] [-l|--log-file <log-file>]
-    [-ll|--log-level <log-level>] [-?|-h|--help]
     <input-file>
+    [-s|--settings <settings>] [-id|--session-id <session-id>]
+    [-o|--output <output>]
+    [-l|--log-file <log-file>] [-ll|--log-level <log-level>]
+    [-dco|--disable-console-output] [--nologo]
+    [-?|-h|--help]
 ```
 
 ### Arguments
@@ -89,6 +91,14 @@ Microsoft.CodeCoverage.Console instrument
 
   Sets the log level. Supported values: `Error`, `Info`, and  `Verbose`.
 
+* **`-dco|--disable-console-output`**
+
+  Disables console output.
+
+* **`--nologo`**
+
+  Do not display Code Coverage banner.
+
 ## Static code coverage for C++ code
 
 The Microsoft.CodeCoverage.Console tool can be used to collect code coverage for C++ using static instrumentation. There are three different methods available that you can use. To demonstrate, let's assume we have a simple C++ console application (linked with the option [/PROFILE](/cpp/build/reference/profile-performance-tools-profiler)):
@@ -162,6 +172,7 @@ Then, start the application as follows:
 D:\ConsoleApplication\x64\Debug>.\ConsoleApplication.exe
 Hello World!
 ```
+
 > [!NOTE]
 > Instrumented native binary contains a reference to `static_covrun64.dll`. Make sure that this file is next to the instrumented binary or the directory where `static_covrun64.dll` is located is listed in the `Path` environment variable. The `collect` and `connect` commands are adding proper directories to `Path` automatically.
 

docs/test/using-code-coverage-to-determine-how-much-code-is-being-tested.md

@@ -78,7 +78,7 @@ Don't forget to run code coverage again after updating your code. Coverage resul
 
 ::: moniker range=">=vs-2022"
 > [!TIP]
-> Starting in Visual Studio 2022 Update 2, you can enable faster code coverage test results by selecting **Tools > Options > Environment > Preview Features**, then selecting **Code coverage experience improvements**, and then restarting Visual Studio.
+> Starting in Visual Studio 2022 version 17.2, you can enable latest code coverage features by selecting **Tools > Options > Environment > Preview Features**, then selecting **Code coverage experience improvements**, and then restarting Visual Studio.
 ::: moniker-end
 
 ## Report in blocks or lines
@@ -90,7 +90,11 @@ You can also have the results displayed for lines by choosing **Add/Remove Colum
 > A line of code can contain more than one code block. If this is the case, and the test run exercises all the code blocks in the line, it is counted as one line. If some but not all code blocks in the line are exercised, it is counted as a partial line.
 
 ::: moniker range=">=vs-2022"
-## Filter code coverage results
+## Code coverage results views
+
+The **Code Coverage Results** window usually structures the report in the project/class/method hierarchy. You can change this to show the coverage on directory/file/method level.
+
+- **To view the source Report**, select the **Configure Code Coverage Views** icon in the **Code Coverage Results** window. Then select **Source View** from the **Report Style** drop-down.
 
 The **Code Coverage Results** window usually shows the result for the entire solution. The results can be filtered to show the results for only the files that have been updated in the current branch. 
 
@@ -115,23 +119,23 @@ You can merge the results of several runs, for example from runs that use differ
 
 - **To view a previous set of results**, select it from the drop-down menu. The menu shows a temporary list that is cleared when you open a new solution.
 
-- **To view results from a previous session**, choose **Import Code Coverage Results**, navigate to the **TestResults** folder in your solution, and import a *.coverage* file.
+- **To view results from a previous session**, choose **Import Results**, navigate to the **TestResults** folder in your solution, and import a *.coverage* file.
 
    The coverage coloring might be incorrect if the source code has changed since the *.coverage* file was generated.
 
-- **To make results readable as text**, choose **Export Code Coverage Results**. This generates a readable *.coveragexml* file, which you could process with other tools or send easily in mail. You can also select export formats such as Cobertura.
+- **To make results readable as text**, choose **Export Results**, select *.xml* as **Save as type**. This generates a readable *.xml* file, which you could process with other tools or send easily in mail. You can also select export formats such as Cobertura.
 
-- **To send results to someone else**, send either a *.coverage* file or an exported *.coveragexml* file. They can then import the file. If they have the same version of the source code, they can see coverage coloring.
+- **To send results to someone else**, send either a *.coverage* file or an exported *.xml* file. They can then import the file. If they have the same version of the source code, they can see coverage coloring.
 
 ## Merge results from different runs
 
 In some situations, different blocks in your code will be used depending on the test data. Therefore, you might want to combine the results from different test runs.
 
 For example, suppose that when you run a test with input "2", you find that 50% of a particular function is covered. When you run the test a second time with the input "-2", you see in the coverage coloring view that the other 50% of the function is covered. Now you merge the results from the two test runs, and the report and coverage coloring view shows that 100% of the function was covered.
 
-Use ![Icon for Merge button in Code Coverage window.](../test/media/codecoverage-mergeicon.png) **Merge Code Coverage Results** to do this. You can choose any combination of recent runs or imported results. If you want to combine exported results, you must import them first.
+Use ![Icon for Merge button in Code Coverage window.](../test/media/codecoverage-mergeicon.png) **Merge Results** to do this. You can choose any combination of recent runs or imported results. If you want to combine exported results, you must import them first.
 
-Use **Export Code Coverage Results** to save the results of a merge operation.
+Use **Export Results** to save the results of a merge operation.
 
 ### Limitations in merging
 
@@ -271,6 +275,7 @@ ExcludeSourceFromCodeCoverage(Exclusion4, L"*\\unittest1.cpp");
 #pragma managed(pop)
 
 ```
+
 ---
 
 Use the following macros: