Merge pull request #10529 from MicrosoftDocs/main638694760334721159sync_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]

.openpublishing.publish.config.json

@@ -10,7 +10,8 @@
       "moniker_ranges": [],
       "open_to_public_contributors": true,
       "type_mapping": {
-        "Conceptual": "Content"
+        "Conceptual": "Content",
+        "ZonePivotGroups": "Toc"
       },
       "build_entry_point": "docs",
       "template_folder": "_themes"

docs/code-quality/code-metrics-cyclomatic-complexity.md

@@ -1,6 +1,6 @@
 ---
 title: Code metrics - Cyclomatic complexity
-ms.date: 5/7/2021
+ms.date: 12/10/2024
 description: Explore the cyclomatic complexity metric for code metrics in Visual Studio and estimate the difficulty to test, maintain, and troubleshoot your code.
 ms.topic: conceptual
 author: mikejo5000
@@ -25,33 +25,33 @@ Notice the cyclomatic complexity is at 2 (the lowest value possible). If you add
 
 ![Cyclomatic complexity example 2](media/cyclomatic-complexity-example-2.png)
 
-If you add a decision, the cyclomatic complexity value goes up by 1:
+If you add a decision, the cyclomatic complexity value goes up by one:
 
 ![Cyclomatic complexity example 3](media/cyclomatic-complexity-example-3.png)
 
-When you change the if statement to a switch statement with 4 decisions to be made then, it goes from the original 2 to 6:
+When you change the if statement to a switch statement with four decisions to be made then, it goes from the original two to six:
 
 ![Cyclomatic complexity example 4](media/cyclomatic-complexity-example-4.png)
 
 Let's take a look at a (hypothetical) larger code base.
 
 ![Cyclomatic complexity example 5](media/cyclomatic-complexity-example-5.png)
 
-Notice that most of the items, as you drill down into the Products_Related class, have a value of 1 but a couple of them have a complexity of 5. By itself, this might not be a big deal, but given that most other members have a 1 in the same class, you should definitely look closer at those two items and see what is in them. You can do this by right-clicking the item and choosing **Go To Source Code** from the context menu. Take a closer look at `Product.set(Product)`:
+Notice that most of the items, as you drill down into the Products_Related class, have a value of one but a couple of them have a complexity of five. By itself, this difference might not be a big deal, but given that most other members have a one in the same class, you should definitely look closer at those two items and see what is in them. You can do take a closer look by right-clicking the item and choosing **Go To Source Code** from the context menu. Take a closer look at `Product.set(Product)`:
 
 ![Cyclomatic complexity example 6](media/cyclomatic-complexity-example-6.png)
 
-Given all the if statements, you can see why the cyclomatic complexity is at a 5. At this point, you might decide that this is an acceptable level of complexity, or you might refactor to reduce the complexity.
+Given all the if statements, you can see why the cyclomatic complexity is at a five. At this point, you might decide that this result is an acceptable level of complexity, or you might refactor to reduce the complexity.
 
 ## The Magic Number
 
-As with many metrics in this industry, there is no exact cyclomatic complexity limit that fits all organizations. However, [NIST235](#nist235) does indicate that a limit of 10 is a good starting point:
+As with many metrics in this industry, there's no exact cyclomatic complexity limit that fits all organizations. However, [NIST235](#nist235) does indicate that a limit of 10 is a good starting point:
 
-"The precise number to use as a limit, however, remains somewhat controversial. The original limit of 10 as proposed by McCabe has significant supporting evidence, but limits as high as 15 have been used successfully as well. Limits over 10 should be reserved for projects that have several operational advantages over typical projects, for example experienced staff, formal design, a modern programming language, structured programming, code walkthroughs, and a comprehensive test plan. In other words, an organization can pick a complexity limit greater than 10, but only if it is sure it knows what it is doing and is willing to devote the additional testing effort required by more complex modules." [NIST235](#nist235)
+"The precise number to use as a limit, however, remains somewhat controversial. The original limit of 10 as proposed by McCabe has significant supporting evidence, but limits as high as 15 have been used successfully as well. Limits over 10 should be reserved for projects that have several operational advantages over typical projects, for example experienced staff, formal design, a modern programming language, structured programming, code walkthroughs, and a comprehensive test plan. In other words, an organization can pick a complexity limit greater than 10, but only if it's sure it knows what it's doing and is willing to devote the additional testing effort required by more complex modules." [NIST235](#nist235)
 
 ## Cyclomatic Complexity and Line Numbers
 
-Just looking at the number of lines of code by itself is, at best, a very broad predictor of code quality. There is some basic truth to the idea that the more lines of code in a function, the more likely it is to have errors. However, when you combine cyclomatic complexity with lines of code, then you have a much clearer picture of the potential for errors.
+Just looking at the number of lines of code by itself is, at best, a very broad predictor of code quality. There's some basic truth to the idea that the more lines of code in a function, the more likely it's to have errors. However, when you combine cyclomatic complexity with lines of code, then you have a much clearer picture of the potential for errors.
 
 As described by the Software Assurance Technology Center (SATC) at NASA:
 

docs/code-quality/index.yml

@@ -10,7 +10,7 @@ metadata:
   ms.topic: landing-page
   author: Mikejo5000
   ms.author: mikejo
-  ms.date: 10/15/2019
+  ms.date: 12/10/2024
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
 
@@ -53,9 +53,9 @@ landingContent:
             url: /dotnet/fundamentals/productivity/code-analysis#code-style-analysis
       - linkListType: reference
         links:
-          - text: .NET code quality rules
+          - text: .NET code quality rules >>
             url: /dotnet/fundamentals/code-analysis/quality-rules/
-          - text: .NET code style rules
+          - text: .NET code style rules >>
             url: /dotnet/fundamentals/code-analysis/style-rules/
 
   # Card

docs/containers/deploy-app-service.md

@@ -14,6 +14,8 @@ ms.author: ghogen
 
 This tutorial walks you through using Visual Studio to publish your containerized ASP.NET Core web application to an [Azure App Service](/azure/app-service). Azure App Service is an appropriate service for a single-container web app hosted in Azure.
 
+You can also deploy to [Azure Container Apps](/azure/container-apps/overview). For a tutorial, see [Deploy to Azure Container Apps using Visual Studio](/azure/container-apps/deploy-visual-studio).
+
 If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/dotnet/?utm_source=acr-publish-doc&utm_medium=docs&utm_campaign=docs) before you begin.
 
 ## Prerequisites

docs/containers/index.yml

@@ -54,6 +54,8 @@ landingContent:
             url: hosting-web-apps-in-docker.md
           - text: Deploy to Azure App Service
             url: deploy-app-service.md
+          - text: Deploy to Azure Container apps
+            url: /azure/container-apps/deploy-visual-studio
           - text: Deploy to Docker Hub
             url: deploy-docker-hub.md
           - text: Deploy without a Dockerfile

docs/containers/launch-profiles.md

@@ -6,14 +6,14 @@ manager: mijacobs
 ms.subservice: container-tools
 ms.devlang: dotnet
 ms.topic: how-to
-ms.date: 10/08/2021
+ms.date: 12/10/2024
 ms.author: ghogen
 monikerRange: ">=vs-2019"
 ---
 
 # Launch a subset of Compose services
 
-If you have an application that consists of multiple services and uses Docker Compose, you can configure which services run and debug by creating or editing an existing launch profile in Docker Compose launch settings. Launch profiles allow you to dynamically run only the services that matter to your current scenario. You can create and select from launch profiles in order to customize your debugging experience and set specific launch actions such as `Browser Launch URL`. You will also have the option of either choosing each service individually or by choosing a Docker Compose profile, which also looks at your Compose file to determine the group of services to run.
+If you have an application that consists of multiple services and uses Docker Compose, you can configure which services run and debug by creating or editing an existing launch profile in Docker Compose launch settings. Launch profiles allow you to dynamically run only the services that matter to your current scenario. You can create and select from launch profiles in order to customize your debugging experience and set specific launch actions such as `Browser Launch URL`. You also have the option of either choosing each service individually or by choosing a Docker Compose profile, which also looks at your Compose file to determine the group of services to run.
 
 For information about Docker Compose profiles, see [Using profiles with Compose](https://docs.docker.com/compose/profiles/).
 
@@ -97,7 +97,7 @@ The next example demonstrates selecting between individual services instead of f
 
 ![Screenshot of launch settings dialog with some services deselected](media/launch-settings/launch-settings-selected.png)
 
-And this information will be saved in *launchSettings.json* as shown below
+And this information is saved in *launchSettings.json* as shown below
 
 ```json
 {
@@ -124,14 +124,14 @@ And this information will be saved in *launchSettings.json* as shown below
 
 You can also further customize launch behaviors by creating Visual Studio launch profiles that make use of the Compose profiles.
 
-To create another profile that makes use of the Compose profile, select **Use Docker Compose profiles** and choose `web1`. Now the launch profile includes three services – `webapplication1` (which belongs to both `web` and `web1` Compose profiles), `external1` and `external2`. By default, the services without source code such as `external1` and  `external2` have the default action of **Start without debugging**. .NET applications with source code will default to **Start debugging**.
+To create another profile that makes use of the Compose profile, select **Use Docker Compose profiles** and choose `web1`. Now the launch profile includes three services: `webapplication1` (which belongs to both `web` and `web1` Compose profiles), `external1`, and `external2`. By default, the services without source code such as `external1` and  `external2` have the default action of **Start without debugging**. .NET applications with source code defaults to **Start debugging**.
 
 > [!IMPORTANT]
-> If a service doesn't specify a Compose profile, it will be included in all Compose profiles implicitly.
+> If a service doesn't specify a Compose profile, it's included in all Compose profiles implicitly.
 
 ![Screenshot of launch settings dialog with another profile created](media/launch-settings/launch-settings-create-profile.png)
 
-This information will be saved as shown in the following code. The configuration for the service and its default action are not saved unless you change the default action.
+This information is saved as shown in the following code. The configuration for the service and its default action are not saved unless you change the default action.
 
 ```json
 {
@@ -172,7 +172,7 @@ You can also change the action of webapplication1 to **Start without debugging**
 
 ## Properties
 
-Here is a description of each property in the *launchSettings.json*:
+Here's a description of each property in the *launchSettings.json*:
 
 |Property| Description|
 | - | - |

docs/containers/overview.md

@@ -291,3 +291,7 @@ For further details on the services implementation and use of Visual Studio tool
 [Debugging apps in a local Docker container](edit-and-refresh.md)
 
 [Deploy an ASP.NET container to a container registry using Visual Studio](hosting-web-apps-in-docker.md)
+
+[Deploy to Azure App Service](deploy-app-service.md)
+
+[Deploy to Azure Container Apps using Visual Studio](/azure/container-apps/deploy-visual-studio)

docs/debugger/using-breakpoints.md

@@ -21,13 +21,15 @@ author: mikejo5000
 ms.author: mikejo
 manager: mijacobs
 ms.subservice: debug-diagnostics
+zone_pivot_groups: programming-languages-set-one
 ---
 # Use the right type of breakpoint
 
 This article shows how to use different types of breakpoints in Visual Studio to improve debugging efficiency. It covers various scenarios where breakpoints can be applied, such as pausing code execution, logging information, and tracking changes in variable states. The article explains how to set conditional breakpoints, tracepoints, data breakpoints, dependent breakpoints, and temporary breakpoints. It also includes detailed instructions on setting function breakpoints. This guide is essential for developers looking to leverage breakpoints for effective debugging in Visual Studio.
 
 If you're unfamiliar with using breakpoints in Visual Studio, see [Get started with breakpoints](get-started-with-breakpoints.md) before going through this article.
- 
+
+::: zone pivot="programming-language-dotnet,programming-language-dotnetf,programming-language-cpp,programming-language-all"
 ## Scenarios
 
 The following table shows common debugging scenarios for breakpoints and the recommended breakpoint type for the scenario.
@@ -43,6 +45,7 @@ The following table shows common debugging scenarios for breakpoints and the rec
 | Can I pause code inside a loop at a certain iteration? | Set a Dependent breakpoint that breaks execution only if another breakpoint is first hit. For more information, see [Hit count](#set-a-hit-count-condition). |
 | Can I pause code at the start of a function when I know the function name but not its location? | You can do this with a function breakpoint. For more information, see [Set function breakpoints](#BKMK_Set_a_breakpoint_in_a_source_file). |
 | Can I pause code at the start of multiple functions with the same name? | When you have multiple functions with the same name (overloaded functions or functions in different projects), you can use a [function breakpoint](#BKMK_Set_a_breakpoint_in_a_source_file). |
+::: zone-end
 
 ## <a name="BKMK_Print_to_the_Output_window_with_tracepoints"></a> Breakpoint actions and tracepoints
 
@@ -103,6 +106,7 @@ If you set a breakpoint condition with invalid syntax, a warning message appears
 >[!NOTE]
 > For the **When changed** field, the debugger doesn't consider the first evaluation of the condition to be a change, so doesn't hit the breakpoint on the first evaluation.
 
+::: zone pivot="programming-language-dotnet,programming-language-dotnetf"
 ### <a name="using-object-ids-in-breakpoint-conditions-c-and-f"></a> Use Object IDs in conditional expressions (C# and F# only)
 
  There are times when you want to observe the behavior of a specific object. For example, you might want to find out why an object was inserted into a collection more than once. In C# and F#, you can create object IDs for specific instances of [reference types](/dotnet/csharp/language-reference/keywords/reference-types), and use them in breakpoint conditions. The object ID is generated by the common language runtime (CLR) debugging services and associated with the object.
@@ -127,6 +131,7 @@ If you set a breakpoint condition with invalid syntax, a warning message appears
 
 > [!NOTE]
 > Object IDs create weak references, and do not prevent the object from being garbage collected. They are valid only for the current debugging session.
+::: zone-end
 
 ### Set a hit count condition
 
@@ -191,6 +196,7 @@ You can break execution when a function is called. This is useful, for example,
 
 1. Select **OK**.
 
+::: zone pivot="programming-language-cpp"
 ### Set a function breakpoint using a memory address (native C++ only)
 
  You can use the address of an object to set a function breakpoint on a method called by a specific instance of a class.  For example, given an addressable object of type `my_class`, you can set a function breakpoint on the `my_method` method that instance calls.
@@ -206,9 +212,10 @@ You can break execution when a function is called. This is useful, for example,
    ```cpp
    ((my_class *) 0xcccccccc)->my_method
    ```
-
+::: zone-end
 ::: moniker range=">= vs-2019"
 
+::: zone pivot="programming-language-dotnet"
 ## <a name="BKMK_set_a_data_breakpoint_managed"></a>Set data breakpoints (.NET Core 3.x or .NET 5+)
 
 Data breakpoints break execution when a specific object's property changes.
@@ -229,9 +236,10 @@ Data breakpoints for .NET Core and .NET 5+ won't work for:
 - Fields inside of structs
 
 For the maximum number that you can set, see [Data breakpoint hardware limits](#data-breakpoint-hardware-limits).
-
+::: zone-end
 ::: moniker-end
 
+::: zone pivot="programming-language-cpp"
 ## <a name="BKMK_set_a_data_breakpoint_native_cplusplus"></a>Set data breakpoints (native C++ only)
 
  Data breakpoints break execution when a value stored at a specified memory address changes. If the value is read but not changed, execution doesn't break.
@@ -256,7 +264,9 @@ Data breakpoints don't work under the following conditions:
 > - Data breakpoints depend on specific memory addresses. The address of a variable changes from one debugging session to the next, so data breakpoints are automatically disabled at the end of each debugging session.
 >
 > - If you set a data breakpoint on a local variable, the breakpoint remains enabled when the function ends, but the memory address is no longer applicable, so the behavior of the breakpoint is unpredictable. If you set a data breakpoint on a local variable, you should delete or disable the breakpoint before the function ends.
+::: zone-end
 
+::: zone pivot="programming-language-dotnet,programming-language-cpp"
 ## Data breakpoint hardware limits
 
 The Windows kernel and the underlying hardware have the following limits when setting data breakpoints. The limit refers to the maximum number of data breakpoints that you can set.
@@ -266,7 +276,7 @@ The Windows kernel and the underlying hardware have the following limits when se
 |x64 and x86|4|
 |ARM64|2|
 |ARM|1|
-
+::: zone-end
 ::: moniker range=">= vs-2022"
 ## <a name="BKMK_set_a_dependent_breakpoint"></a>Set a dependent breakpoint
 

docs/deployment/deploying-applications-services-and-components-resources.md

@@ -114,6 +114,18 @@ For more information on publishing to App Service, see:
 - [Publish an ASP.NET Core app to Azure App Service](/aspnet/core/tutorials/publish-to-azure-webapp-using-vs)
 - [Troubleshoot ASP.NET Core on Azure App Service and IIS](/aspnet/core/test/troubleshoot-azure-iis).
 
+### Azure WebJobs
+
+Azure WebJobs is supported through App Service. See [Develop and deploy WebJobs using Visual Studio](/azure/app-service/webjobs-dotnet-deploy-vs).
+
+#### When to choose Azure WebJobs
+
+- You have a worker process, a computation that can run without user interaction.
+- The job is on-demand, triggered by an event, or continuous.
+- The job runs on Windows, or .NET Core on Linux (with Visual Studio 17.12 or later).
+
+Another option for similar scenarios is Azure Functions. To choose the right option for you, see [Choose the right integration and automation services in Azure](/azure/azure-functions/functions-compare-logic-apps-ms-flow-webjobs).
+
 ### Azure Container Registry
 
 [Azure Container Registry](/azure/container-registry/) allows you to build, store, and manage Docker container images and artifacts in a private registry for all types of container deployments.

docs/docfx.json

@@ -98,6 +98,7 @@
       "feedback_help_link_type": "ask-the-community",      
       "feedback_product_url": "https://developercommunity.visualstudio.com/VisualStudio/suggest",
       "breadcrumb_path": "/visualstudio/_breadcrumb/toc.json",
+      "zone_pivot_group_filename": "zone-pivot-groups.json",
       "manager": "jmartens",
       "audience": "developer",
       "defaultDevLang": "csharp",