Merge pull request #159001 from MicrosoftDocs/master

merge master to live, 4 PM Sunday

Author: jborsecnik

articles/connectors/apis-list.md

@@ -40,7 +40,7 @@ An *action* is an operation that follows the trigger and performs some kind of t
 
 ## Connector categories
 
-In Logic Apps, most triggers and actions are available in either a *built-in* version or *managed connector* version. A small number of triggers and actions are available in both versions. The versions available depend on whether you create a multi-tenant logic app or a single-tenant logic app, which is currently available only in [Logic Apps Preview](../logic-apps/single-tenant-overview-compare.md).
+In Logic Apps, most triggers and actions are available in either a *built-in* version or *managed connector* version. A small number of triggers and actions are available in both versions. The versions available depend on whether you create a multi-tenant logic app or a single-tenant logic app, which is currently available only in [single-tenant Azure Logic Apps](../logic-apps/single-tenant-overview-compare.md).
 
 [Built-in triggers and actions](built-in.md) run natively on the Logic Apps runtime, don't require creating connections, and perform these kinds of tasks:
 

articles/connectors/connectors-create-api-mq.md

@@ -7,7 +7,7 @@ author: ChristopherHouser
 ms.author: chrishou
 ms.reviewer: valthom, estfan, logicappspm
 ms.topic: article
-ms.date: 04/26/2021
+ms.date: 05/25/2021
 tags: connectors
 ---
 
@@ -25,11 +25,9 @@ This connector includes a Microsoft MQ client that communicates with a remote MQ
 
 ## Available operations
 
-The IBM MQ connector provides actions but no triggers.
+* Multi-tenant Azure Logic Apps: When you create a **Logic App (Consumption)** resource, you can connect to an MQ server only by using the *managed* MQ connector. This connector provides only actions, no triggers.
 
-* Multi-tenant Azure Logic Apps: When you create a consumption-based logic app workflow, you can connect to an MQ server by using the *managed* MQ connector.
-
-* Single-tenant Azure Logic Apps (preview): When you create a preview logic app workflow, you can connect to an MQ server by using either the managed MQ connector or the *built-in* MQ operations (preview).
+* Single-tenant Azure Logic Apps: When you create a single-tenant based logic app workflow, you can connect to an MQ server by using either the managed MQ connector, which includes *only* actions, or the *built-in* MQ operations, which includes triggers *and* actions.
 
 For more information about the difference between a managed connector and built-in operations, review [key terms in Logic Apps](../logic-apps/logic-apps-overview.md#logic-app-concepts).
 
@@ -44,11 +42,14 @@ The following list describes only some of the managed operations available for M
 
 For all the managed connector operations and other technical information, such as properties, limits, and so on, review the [MQ connector's reference page](/connectors/mq/).
 
-#### [Built-in (preview)](#tab/built-in)
+#### [Built-in](#tab/built-in)
 
 The following list describes only some of the built-in operations available for MQ:
 
-* Receive a single message or an array of messages from the MQ server. For multiple messages, you can specify the maximum number of messages to return per batch and the maximum batch size in KB.
+* When a message is available in a queue, take some action.
+* When one or more messages are received from a queue (auto-complete), take some action.
+* When one or more messages are received from a queue (peek-lock), take some action.
+* Receive a single message or an array of messages from a queue. For multiple messages, you can specify the maximum number of messages to return per batch and the maximum batch size in KB.
 * Send a single message or an array of messages to the MQ server.
 
 These built-in MQ operations also have the following capabilities plus the benefits from all the other capabilities for logic apps in the [single-tenant Logic Apps service](../logic-apps/single-tenant-overview-compare.md):
@@ -121,7 +122,7 @@ When you add an MQ action for the first time, you're prompted to create a connec
 
 1. When you're done, select **Create**.
 
-#### [Built-in (preview)](#tab/built-in)
+#### [Built-in](#tab/built-in)
 
 1. Provide the connection information for your MQ server.
 

articles/logic-apps/create-single-tenant-workflows-azure-portal.md

@@ -1,16 +1,16 @@
 ---
-title: DevOps deployment for single-tenant Azure Logic Apps (preview)
-description: Learn about DevOps deployment for single-tenant Azure Logic Apps (preview).
+title: DevOps deployment for single-tenant Azure Logic Apps
+description: Learn about DevOps deployment for single-tenant Azure Logic Apps.
 services: logic-apps
 ms.suite: integration
 ms.reviewer: estfan, azla
 ms.topic: conceptual
-ms.date: 05/10/2021
+ms.date: 05/25/2021
 
 # As a developer, I want to learn about DevOps deployment support for single-tenant Azure Logic Apps.
 ---
 
-# DevOps deployment for single-tenant Azure Logic Apps (preview)
+# DevOps deployment for single-tenant Azure Logic Apps
 
 With the trend towards distributed and native cloud apps, organizations are dealing with more distributed components across more environments. To maintain control and consistency, you can automate your environments and deploy more components faster and more confidently by using DevOps tools and processes.
 
@@ -20,9 +20,9 @@ This article provides an introduction and overview about the current continuous
 
 ## Single-tenant versus multi-tenant
 
-In the original multi-tenant Azure Logic Apps, resource deployment is based on Azure Resource Manager (ARM) templates, which combine and handle resource provisioning for both logic apps and infrastructure. In single-tenant Azure Logic Apps, deployment becomes easier because you can use separate provisioning between apps and infrastructure.
+In the original *multi-tenant* Azure Logic Apps, resource deployment is based on Azure Resource Manager (ARM) templates, which combine and handle resource provisioning for both logic apps and infrastructure. In single-tenant Azure Logic Apps, deployment becomes easier because you can use separate provisioning between apps and infrastructure.
 
-When you create logic apps using the **Logic App (Preview)** resource type, your workflows are powered by the redesigned Azure Logic Apps (Preview) runtime. This runtime uses the [Azure Functions extensibility model](../azure-functions/functions-bindings-register.md) extensibility and is [hosted as an extension on the Azure Functions runtime](https://techcommunity.microsoft.com/t5/integrations-on-azure/azure-logic-apps-running-anywhere-runtime-deep-dive/ba-p/1835564). This design provides portability, flexibility, and more performance for your logic apps plus other capabilities and benefits inherited from the Azure Functions platform and Azure App Service ecosystem.
+When you create logic apps using the **Logic App (Standard)** resource type, your workflows are powered by the redesigned single-tenant Azure Logic Apps runtime. This runtime uses the [Azure Functions extensibility model](../azure-functions/functions-bindings-register.md) extensibility and is [hosted as an extension on the Azure Functions runtime](https://techcommunity.microsoft.com/t5/integrations-on-azure/azure-logic-apps-running-anywhere-runtime-deep-dive/ba-p/1835564). This design provides portability, flexibility, and more performance for your logic apps plus other capabilities and benefits inherited from the Azure Functions platform and Azure App Service ecosystem.
 
 For example, you can package the redesigned runtime and workflows together as part of your logic app. You can use generic steps or tasks that build, assemble, and zip your logic app resources into ready-to-deploy artifacts. To deploy your apps, copy the artifacts to the host environment and then start your apps to run your workflows. Or, integrate your artifacts into deployment pipelines using the tools and processes that you already know and use. For example, if your scenario requires containers, you can containerize your logic apps and integrate them into your existing pipelines.
 
@@ -34,13 +34,13 @@ By using standard build and deploy options, you can focus on app development sep
 
 ## DevOps deployment capabilities
 
-single-tenant Azure Logic Apps inherits many capabilities and benefits from the Azure Functions platform and Azure App Service ecosystem. These updates include a whole new deployment model and more ways to use DevOps for your logic app workflows.
+Single-tenant Azure Logic Apps inherits many capabilities and benefits from the Azure Functions platform and Azure App Service ecosystem. These updates include a whole new deployment model and more ways to use DevOps for your logic app workflows.
 
 <a name="local-development-testing"></a>
 
 ### Local development and testing
 
-When you use Visual Studio Code with the Azure Logic Apps (Preview) extension, you can locally develop, build, and run **Logic App (Preview)** workflows in your development environment without having to deploy to Azure. You can also run your workflows anywhere that Azure Functions can run. For example, if your scenario requires containers, you can containerize your logic apps and deploy as Docker containers.
+When you use Visual Studio Code with the Azure Logic Apps (Standard) extension, you can locally develop, build, and run single-tenant based logic app workflows in your development environment without having to deploy to Azure. You can also run your workflows anywhere that Azure Functions can run. For example, if your scenario requires containers, you can containerize your logic apps and deploy as containers.
 
 This capability is a major improvement and provides a substantial benefit compared to the multi-tenant model, which requires you to develop against an existing and running resource in Azure.
 
@@ -56,7 +56,7 @@ The single-tenant model gives you the capability to separate the concerns betwee
 
 ### Resource structure
 
-Single-tenant Azure Logic Apps introduces a new resource structure where your logic app can host multiple workflows. This structure differs from the multi-tenant version where you have a 1:1 mapping between logic app resource and workflow. With this 1-to-many relationship, workflows in the same logic app can share and reuse other resources. Plus, these workflows also benefit from improved performance due to shared tenancy and proximity to each other.
+Single-tenant Azure Logic Apps introduces a new resource structure where your logic app can host multiple workflows. This structure differs from the multi-tenant model where you have a 1:1 mapping between logic app resource and workflow. With this 1-to-many relationship, workflows in the same logic app can share and reuse other resources. Plus, these workflows also benefit from improved performance due to shared tenancy and proximity to each other.
 
 This resource structure looks and works similarly to Azure Functions where a function app can host many functions. If you're working in a logic app project within Visual Studio Code, your project folder and file structure looks like the following example:
 
@@ -79,7 +79,6 @@ MyLogicAppProjectName
 | connections.json
 | host.json
 | local.settings.json
-| Dockerfile
 ```
 
 At your project's root level, you can find the following files and folders, along with other items depending on your project is extension bundle-based (Node.js), which is the default, or is NuGet package-based (.NET).
@@ -93,8 +92,7 @@ At your project's root level, you can find the following files and folders, alon
 | .funcignore | File | Review [Work with Azure Functions Core Tools](../azure-functions/functions-run-local.md) |
 | connections.json | File | Contains the metadata, endpoints, and keys for any managed connections and Azure functions that your workflows use. <p><p>**Important**: To use different connections and functions for each environment, make sure that you parameterize this **connections.json** file and update the endpoints. |
 | host.json | File | Contains runtime-specific configuration settings and values, for example, the default limits for the single-tenant Azure Logic Apps platform, logic apps, workflows, triggers, and actions. |
-| local.settings.json | File | Contains the local environment variables that provides the `appSettings` values to use for your logic app when running locally.  |
-| Dockerfile | Folder | Contains one or more Dockerfiles to use for deploying the logic app as a container. |
+| local.settings.json | File | Contains the local environment variables that provide the `appSettings` values to use for your logic app when running locally.  |
 ||||
 
 For example, to create custom built-in operations, you must have a NuGet based project, not an extension bundle-based project. A NuGet-based project includes a .bin folder that contains packages and other library files that your app needs, while a bundle-based project doesn't include this folder and files. For more information about converting your project to use NuGet, review [Enable built-connector authoring](create-stateful-stateless-workflows-visual-studio-code.md#enable-built-in-connector-authoring).
@@ -106,8 +104,8 @@ For more information and best practices about how to best organize workflows in
 ### Container deployment
 
 Single-tenant Azure Logic Apps supports deployment to containers, which means that you can containerize your logic app workflows and run them anywhere that containers can run. After you containerize your app, deployment works mostly the same as any other container you deploy and manage.
- 
-For examples that include Azure DevOps, review [CI/CD for Containers](https://azure.microsoft.com/solutions/architecture/cicd-for-containers/). For more information about containerizing logic apps and deploying to Docker, review [Deploy your logic app to a Docker container from Visual Studio Code](create-stateful-stateless-workflows-visual-studio-code.md#deploy-to-docker).
+
+For examples that include Azure DevOps, review [CI/CD for Containers](https://azure.microsoft.com/solutions/architecture/cicd-for-containers/).
 
 <a name="app-settings-parameters"></a>
 
@@ -121,7 +119,7 @@ In single-tenant Azure Logic Apps, you can call and reference your environment v
 
 ## Managed connectors and built-in operations
 
-The Azure Logic Apps ecosystem provides [hundreds of Microsoft-managed connectors](/connectors/connector-reference/connector-reference-logicapps-connectors) and built-in operations as part of a constantly growing collection that you can use in the single-tenant Azure Logic Apps service. The way that Microsoft maintains these connectors and built-in operations stays mostly the same in single-tenant Azure Logic Apps.
+The Azure Logic Apps ecosystem provides [hundreds of Microsoft-managed connectors](/connectors/connector-reference/connector-reference-logicapps-connectors) and built-in operations as part of a constantly growing collection that you can use in single-tenant Azure Logic Apps. The way that Microsoft maintains these connectors and built-in operations stays mostly the same in single-tenant Azure Logic Apps.
 
 The most significant improvement is that the single-tenant service makes more popular managed connectors also available as built-in operations. For example, you can use built-in operations for Azure Service Bus, Azure Event Hubs, SQL, and others. Meanwhile, the managed connector versions are still available and continue to work.
 
@@ -133,7 +131,7 @@ In Visual Studio Code, when you use the designer to develop or make changes to y
 
 ### Service provider connections
 
-When you use a built-in operation for a service such as Azure Service Bus or Azure Event Hubs in the single-tenant Azure Logic Apps service, you create a service provider connection that runs in the same process as your workflow. This connection infrastructure is hosted and managed as part of your logic app, and your app settings store the connection strings for any service provider-based built-in operation that your workflows use.
+When you use a built-in operation for a service such as Azure Service Bus or Azure Event Hubs in single-tenant Azure Logic Apps, you create a service provider connection that runs in the same process as your workflow. This connection infrastructure is hosted and managed as part of your logic app, and your app settings store the connection strings for any service provider-based built-in operation that your workflows use.
 
 In your logic app project, each workflow has a workflow.json file that contains the workflow's underlying JSON definition. This workflow definition then references the necessary connection strings in your project's connections.json file.
 
@@ -210,7 +208,7 @@ To call functions created and hosted in Azure Functions, you use the built-in Az
 
 ## Authentication
 
-In the single-tenant Azure Logic Apps service, the hosting model for logic app workflows is a single tenant where your workloads benefit from more isolation than in the multi-tenant version. Plus, the service runtime is portable, which means you can run your workflows anywhere that Azure Functions can run. Still, this design requires a way for logic apps to authenticate their identity so they can access the managed connector ecosystem in Azure. Your apps also need the correct permissions to run operations when using managed connections.
+In single-tenant Azure Logic Apps, the hosting model for logic app workflows is a single tenant where your workloads benefit from more isolation than in the multi-tenant model. Plus, the single-tenant Azure Logic Apps runtime is portable, which means you can run your workflows anywhere that Azure Functions can run. Still, this design requires a way for logic apps to authenticate their identity so they can access the managed connector ecosystem in Azure. Your apps also need the correct permissions to run operations when using managed connections.
 
 By default, each single-tenant based logic app has an automatically enabled system-assigned managed identity. This identity differs from the authentication credentials or connection string used for creating a connection. At runtime, your logic app uses this identity to authenticate its connections through Azure access policies. If you disable this identity, connections won't work at runtime.
 
@@ -240,9 +238,9 @@ For logic apps that run in your local development environment using Visual Studi
 
 ## Next steps
 
-* [Set up DevOps deployment for single-tenant Azure Logic Apps (Preview)](set-up-devops-deployment-single-tenant-azure-logic-apps.md)
+* [Set up DevOps deployment for single-tenant Azure Logic Apps](set-up-devops-deployment-single-tenant-azure-logic-apps.md)
 
-We'd like to hear about your experiences with the preview logic app resource type and preview single-tenant model!
+We'd like to hear about your experiences with the new logic app resource type and single-tenant model!
 
 - For bugs or problems, [create your issues in GitHub](https://github.com/Azure/logicapps/issues).
 - For questions, requests, comments, and other feedback, [use this feedback form](https://aka.ms/logicappsdevops).