Merge pull request #14696 from MicrosoftDocs/main

Auto Publish – main to live - 2025-11-25 23:00 UTC

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

docs/debugger/media/visualstudio/visual-studio-remote-debug-settings.png

@@ -1,7 +1,7 @@
 ---
 title: "Remote Debug ASP.NET Core on Azure App Service"
 description: Configure Azure App Service for remote debugging and attach the remote debugger from Visual Studio to debug the app as though it's running locally.
-ms.date: 04/23/2024
+ms.date: 11/21/2025
 ms.topic: article
 author: "mikejo5000"
 ms.author: "mikejo"
@@ -20,8 +20,6 @@ This article describes how to attach the Visual Studio debugger to an ASP.NET Co
 
 - You must first deploy an ASP.NET Core app to Azure App Service (Windows) from Visual Studio, and the app must be running.
 
-  For hands-on training that includes App Service deployment, see [Remote debug ASP.NET Core on Azure](/training/modules/dotnet-debug-visual-studio-azure-web-apps/).
-
 - Your publish profile in Visual Studio must be set to Debug instead of Release before publishing.
 
 ## Enable remote debugging
@@ -51,11 +49,17 @@ Your app service instance now supports remote debugging through Visual Studio.
    > [!NOTE]
    > Make sure the state of your local code matches what was deployed to Azure. This ensures that the local symbol files and source code line up with the deployed app.
 
-1. Select **Debug > Options** from the top Visual Studio menu. Ensure that **Enable Just My code** is *unchecked* (as shown below), and then select **OK**.
+1. Select **Debug > Options** from the top Visual Studio menu. Ensure that **Enable Just My code** is *unchecked* (as shown in the following illustration), and then select **OK**.
 
     Changing this setting allows Visual Studio to debug the optimized code that was deployed to Azure using the necessary symbol files from your local bin folder. Symbol files are used by the debugger as a bridge between compiled, executing code and the source code in Visual Studio. Matching symbol files are required for remote debugging.
 
+    ::: moniker range="visualstudio"
+    :::image type="content" source="../debugger/media/visualstudio/visual-studio-remote-debug-settings.png" alt-text="A screenshot of the Visual Studio debugging settings.":::
+    ::: moniker-end
+
+   ::: moniker range="vs-2022"
     :::image type="content" source="../debugger/media/vs-2022/visual-studio-remote-debug-settings.png" alt-text="A screenshot of the Visual Studio debugging settings.":::
+    ::: moniker-end
 
 ## Attach the debugger to the App Service
 

docs/debugger/remote-debugging-azure-app-service.md

@@ -1,7 +1,7 @@
 ---
 title: "Analyze BenchmarkDotNet data in Visual Studio"
 description: Learn how to profile console apps using BenchmarkDotNet.
-ms.date: 11/10/2025
+ms.date: 11/24/2025
 ms.topic: how-to
 dev_langs:
   - "CSharp"
@@ -17,19 +17,9 @@ monikerRange: '>= vs-2022'
 
 # Analyze BenchmarkDotNet data in Visual Studio
 
-You can use the profiling tools to collect and view [BenchmarkDotNet](https://benchmarkdotnet.org/articles/overview.html) data in Visual Studio.
+You can use the profiling tools to collect and view [BenchmarkDotNet](https://benchmarkdotnet.org/articles/overview.html) data in Visual Studio. BenchmarkDotNet is an open-source .NET library designed for performance benchmarking. It automates the process of measuring and comparing the execution time, memory usage, and other performance metrics of your .NET code in a reliable and repeatable way.
 
-When you add a BenchmarkDotNet diagnoser to your benchmark classes as an attribute, a *.diagsession* file is generated after the benchmark runs. You can then open the *.diagsession* in Visual Studio and view profiling data for the benchmarks. 
-
-The following diagnosers are supported:
-
-- CPUUsageDiagnoser
-- DatabaseDiagnoser
-- DotNetCountersDiagnoser
-- EventsDiagnoser
-- FileIODiagnoser
-
-Each diagnoser generates performance data related to that diagnoser. For example, the CPUUsageDiagnoser generates a *.diagsession* file with CPU data in it, and the DatabaseDiagnoser generates a *.diagsession* file with data on database operations. Limitations correspond to the associated profiling tool. For example, the profiler's Database tool works on [ADO.NET](/dotnet/framework/data/adonet/ado-net-overview) or [Entity Framework Core](/ef/core/).
+You use BenchmarkDotNet by installing required NuGet packages in your project and then adding attributes to your code that match the type of performance information you are interested in.
 
 ## Prerequisites
 
@@ -44,30 +34,45 @@ Each diagnoser generates performance data related to that diagnoser. For example
   If you use the Benchmark project template, these NuGet packages are present when you create the project.
   ::: moniker-end
 
-## Create your project
+## Set up your project
 
 ::: moniker range=">=visualstudio"
-The benchmark functions must be added to a .NET console application. These functions can be wrapper functions that reference other project types.
+The benchmark attributes must be added to a .NET console application. The attributes can be added to wrapper functions that reference other project types.
 
-You can either create a console project and add BenchmarkDotNet support manually, or use the **Benchmark Project** template. Some of the steps described in this article are required only when you manually add BenchmarkDotNet support.
+To prepare your project for BenchmarkDotNet support, use one of the following methods:
 
-The **Benchmark Project** template generates a fully integrated BenchmarkDotNet project with built-in support for CPU Usage profiling and Copilot insights. To use the template, select **Profiling** from the project types list when you create a new project, and then choose **Benchmark Project**.
+- Open an existing console project or create a new console project. In this scenario, you manually add BenchmarkDotNet support.
+- Use the **Benchmark Project** template. Some of the steps described in this article are required only when you manually add BenchmarkDotNet support.
+
+  The **Benchmark Project** template generates a fully integrated BenchmarkDotNet project with built-in support for CPU Usage profiling and Copilot insights. To use the template, select **Profiling** from the project types list when you create a new project, and then choose **Benchmark Project**. For information about attributes, see [Attribute your code](#attribute-your-code).
 
 ![Screenshot of BenchmarkDotNet template in Visual Studio.](../profiling/media/visualstudio/benchmark-dotnet-template.png) 
 ::: moniker-end
 ::: moniker range="vs-2022"
-Create a console project.
+Create a console project or use an existing console project.
 
-The benchmark functions must be added to a .NET console application. These functions can be wrapper functions that reference other project types. 
+The benchmark attributes must be added to a .NET console application. The attributes can be added to wrapper functions that reference other project types.
 ::: moniker-end
 
-## Collect Benchmark.NET data
+## Attribute your code
+
+When you add a BenchmarkDotNet diagnoser to your benchmark classes as an attribute, you configure the app to generate a *.diagsession* file after the benchmarks run. You can then open the *.diagsession* file in Visual Studio and view profiling data for the benchmarks. 
+
+The following diagnosers are supported:
 
-1. Set your build to a Release build instead of a Debug build.
+- CPUUsageDiagnoser
+- DatabaseDiagnoser
+- DotNetCountersDiagnoser
+- EventsDiagnoser
+- FileIODiagnoser
 
-1. Attribute your code for diagnosers and benchmarks, and include code to run the benchmarks (`BenchmarkRunner.Run`).
+Each diagnoser generates performance data related to that diagnoser. For example, the CPUUsageDiagnoser generates a *.diagsession* file with CPU data in it, and the DatabaseDiagnoser generates a *.diagsession* file with data on database operations. Limitations correspond to the associated profiling tool. For example, the profiler's Database tool works on [ADO.NET](/dotnet/framework/data/adonet/ado-net-overview) or [Entity Framework Core](/ef/core/).
 
-   Add the diagnoser name as an attribute to the class that contains the benchmarks for which you want to generate data.
+To attribute your code for diagnosers and benchmarks:
+
+1. Add the diagnoser name as an attribute to the class that contains the benchmarks for which you want to generate data.
+
+1. Add the `Benchmark` attribute to the methods that you want to test for performance.
 
    For example, you can use the following code for the CPUUsageDiagnoser.
 
@@ -105,7 +110,7 @@ The benchmark functions must be added to a .NET console application. These funct
             [Benchmark]
             public byte[] Md5() => md5.ComputeHash(data);
         }
-    
+        
         public class Program
         {
             public static void Main(string[] args)
@@ -115,7 +120,11 @@ The benchmark functions must be added to a .NET console application. These funct
         }
     }
     ```
-   
+
+## Collect and view Benchmark.NET data
+
+1. Set your build to a **Release** build instead of a Debug build.
+
 1. Run the application to generate the *.diagsession* file.
 
    Check the console output to get the location of the file. For example:  
@@ -127,8 +136,6 @@ The benchmark functions must be added to a .NET console application. These funct
      Stopped
    Exported diagsession file: *.diagsession
    ```
-   
-## View BenchmarkDotNet data
 
 1. In Visual Studio, select **File > Open > File** and navigate to the location of the *.diagsession* file, and then select and open the file.
 

docs/profiling/profiling-with-benchmark-dotnet.md

@@ -1,7 +1,7 @@
 ---
 title: Mixed-mode debugging for Python
 description: Simultaneously debug C++ and Python in Visual Studio including stepping between environments, viewing values, and evaluating expressions.
-ms.date: 04/18/2024
+ms.date: 11/21/2025
 ms.topic: how-to
 author: cwebster-99
 ms.author: cowebster
@@ -161,7 +161,16 @@ The **Call Stack** window shows both native and Python stack frames interleaved,
 
 :::image type="content" source="media/mixed-mode-debugging-call-stack.png" alt-text="Screenshot of the combined call stack window with mixed-mode debugging in Visual Studio." border="false" lightbox="media/mixed-mode-debugging-call-stack.png":::
 
-- To make transitions appear as **[External Code]** without specifying the direction of transition, set the **Tools** > **Options** > **Debugging** > **General** > **Enable Just My Code** option.
+:::moniker range="visualstudio"
+
+- To make transitions appear as **[External Code]** without specifying the direction of transition, use the **Tools** > **Options** pane. Expand the **All Settings** > **Debugging** > **General** section, select the **Enable Just My Code** checkbox.
+
+:::moniker-end
+:::moniker range="<=vs-2022"
+
+- To make transitions appear as **[External Code]** without specifying the direction of transition, use the **Tools** > **Options** dialog. Expand the **Debugging** > **General** section, select the **Enable Just My Code** checkbox, and then select **OK**.
+
+:::moniker-end
 
 - To make any call frame active, double-click the frame. This action also opens the corresponding source code, if possible. If source code isn't available, the frame is still made active and local variables can be inspected.
 

docs/python/debugging-mixed-mode-c-cpp-python-in-visual-studio.md

@@ -1,7 +1,7 @@
 ---
 title: Symbols for mixed-mode Python/C++ debugging
 description: Explore how you can use Visual Studio to load symbols from program database (PDB) files to support complete mixed-mode debugging for C++ and Python.
-ms.date: 04/18/2024
+ms.date: 11/21/2025
 ms.topic: how-to
 author: cwebster-99
 ms.author: cowebster
@@ -21,10 +21,21 @@ To provide a full debugging experience, the [mixed-mode Python debugger](debuggi
 
 - In Visual Studio 2015 and earlier, or for other interpreters, you need to download symbols separately and then point Visual Studio to the files.
 
-When Visual Studio detects missing required symbols, a dialog prompts you to take action. You typically see the dialog when you start a mixed-mode debugging session. The dialog includes the **Open symbol settings dialog** link, which opens the **Tools** > **Options** dialog to the **Debugging** > **Symbols** tab, along with a link to this documentation article.
+When Visual Studio detects missing required symbols, a dialog prompts you to take action. You typically see the dialog when you start a mixed-mode debugging session. The dialog includes two links, one of which opens this documentation article. 
 
 :::image type="content" source="media/mixed-mode-debugging-symbols-required.png" alt-text="Screenshot that shows the prompt in Visual Studio to provide the missing required debugging symbols." lightbox="media/mixed-mode-debugging-symbols-required.png" border="false":::
 
+:::moniker range="visualstudio"
+
+The **Open symbol settings dialog** opens the **Tools** > **Options** pane to the **All Settings** > **Debugging** > **Symbols** section.
+
+:::moniker-end
+:::moniker range="<=vs-2022"
+
+The **Open symbol settings dialog** opens the **Tools** > **Options** dialog to the **Debugging** > **Symbols** section.
+
+:::moniker-end
+
 ## Prerequisites
 
 - Visual Studio installed with support for Python workloads. For more information, see [Install Python support in Visual Studio](installing-python-support-in-visual-studio.md).
@@ -91,21 +102,47 @@ If you downloaded symbols separately, follow these steps to make Visual Studio a
 > [!NOTE]
 > If you installed symbols by using the Python 3.5 or later installer, Visual Studio finds the symbols automatically. You don't need to complete the steps in this section.
 
-1. Select **Tools** > **Options**, and open the **Debugging** > **Symbols** tab.
+:::moniker range="visualstudio"
+
+1. Open the **Tools** > **Options** pane and expand the **All Settings** > **Debugging** > **Symbols** > **Search Locations** section.
+
+1. On the toolbar for the **Symbol file (.pdb) locations** list, select **+ Add**.
+
+1. In the **Add item** dialog, enter the folder path where you extracted the downloaded symbols, and then select **Save**.
+
+   Specify the location where the _python.pdb_ file is located, such as *c:\python34\Symbols*, as shown in the following image.
 
-1. Select **Add** (plus symbol) on the toolbar.
+   :::image type="content" source="media/visualstudio/mixed-mode-debugging-symbols.png" border="false" alt-text="Screenshot that shows how to specify the location of the Python mixed mode debugger symbols.":::
 
-1. Enter the folder path where you extracted the downloaded symbols. This location is where the `python.pdb` file is located, such as *c:\python34\Symbols*, as shown in the following image.
+:::moniker-end
+:::moniker range="<=vs-2022"
+
+1. Open the **Tools** > **Options** dialog and expand the **Debugging** > **Symbols** section.
+
+1. On the toolbar for the **Symbol file (.pdb) search locations** list, select **Add** (plus symbol).
+
+1. In the list, enter the folder path where you extracted the downloaded symbols, and then select **OK**.
+
+   Specify the location where the _python.pdb_ file is located, such as *c:\python34\Symbols*, as shown in the following image.
 
    :::image type="content" source="media/mixed-mode-debugging-symbols.png" alt-text="Screenshot that shows the mixed mode debugger symbols options on the Tools Options Debugging dialog." lightbox="media/mixed-mode-debugging-symbols.png" border="false":::
 
-1. Select **OK**.
+:::moniker-end
 
 During a debugging session, Visual Studio might also prompt you for the location of a source file for the Python interpreter. If you downloaded source files, such as from [python.org/downloads/](https://www.python.org/downloads/), you can point Visual Studio to the downloaded files.
 
 ### Symbol caching options
 
-The **Tools** > **Options**, **Debugging** > **Symbols**  dialog also contains options to configure symbol caching. Visual Studio uses the symbol caching features to create a local cache of symbols obtained from an online source.
+:::moniker range="visualstudio"
+
+The **All Settings** > **Debugging** > **Symbols** section supports other options for configuring symbol caching in the **Search Locations** and **Search and Load** subsections. Visual Studio uses the symbol caching features to create a local cache of symbols obtained from an online source.
+
+:::moniker-end
+:::moniker range="<=vs-2022"
+
+The **Debugging** > **Symbols** section supports other options for configuring symbol caching. Visual Studio uses the symbol caching features to create a local cache of symbols obtained from an online source.
+
+:::moniker-end
 
 These features aren't needed with the Python interpreter symbols because symbols are already present locally. For more information, see [Specify symbols and source files in the Visual Studio debugger](../debugger/specify-symbol-dot-pdb-and-source-files-in-the-visual-studio-debugger.md).
 

docs/python/debugging-symbols-for-mixed-mode-c-cpp-python.md

@@ -2,7 +2,7 @@
 title: Django in Visual Studio tutorial Step 1, Django basics
 titleSuffix: ""
 description: Overview and Step 1 of a core walkthrough of Django capabilities in Visual Studio, including prerequisites, Git, virtual environments, and creating a Django project.
-ms.date: 04/18/2024
+ms.date: 11/21/2025
 ms.topic: tutorial
 author: cwebster-99
 ms.author: cowebster
@@ -213,9 +213,16 @@ For more information on source control as automation, see [The Source of Truth:
 
 Follow these steps to prevent Visual Studio from auto-committing a new project:
 
-::: moniker range=">=vs-2022"
+::: moniker range="visualstudio"
+
+1. Open the **Tools** > **Options** pane and expand the **All Settings** > **Source Control** > **Git Settings** section.
+
+1. Clear the **Commit changes after merge by default** option.
+
+::: moniker-end
+::: moniker range="vs-2022"
 
-1. Select **Tools** > **Options** > **Source Control** > **Git Global Settings**.
+1. Open the **Tools** > **Options** dialog and expand the **Source Control** > **Git Global Settings** section.
 
 1. Clear the **Commit changes after merge by default** option and select **OK**.
 

docs/python/learn-django-in-visual-studio-step-01-project-and-solution.md

@@ -2,7 +2,7 @@
 title: Flask in Visual Studio tutorial Step 1, Flask basics
 titleSuffix: ""
 description: Overview and Step 1 of a core walkthrough of Flask capabilities in Visual Studio, including prerequisites, Git, virtual environments, and creating a new Flask project and web project.
-ms.date: 04/18/2024
+ms.date: 11/21/2025
 ms.topic: tutorial
 author: cwebster-99
 ms.author: cowebster
@@ -202,9 +202,16 @@ For more information on source control as automation, see [The Source of Truth:
 
 Follow these steps to prevent Visual Studio from auto-committing a new project:
 
-::: moniker range=">=vs-2022"
+::: moniker range="visualstudio"
+
+1. Open the **Tools** > **Options** pane and expand the **All Settings** > **Source Control** > **Git Settings** section.
+
+1. Clear the **Commit changes after merge by default** option.
+
+::: moniker-end
+::: moniker range="vs-2022"
 
-1. Select **Tools** > **Options** > **Source Control** > **Git Global Settings**.
+1. Open the **Tools** > **Options** dialog and expand the **Source Control** > **Git Global Settings** section.
 
 1. Clear the **Commit changes after merge by default** option and select **OK**.