Merge branch 'live' into patch-5

Author: phecke

.openpublishing.publish.config.json

@@ -105,16 +105,19 @@
       "Publish",
       "PDF"
     ],
-   "alm-guide": [
+    "alm-guide": [
       "Publish",
       "PDF"
-    ] 
+    ]
   },
   "need_generate_pdf_url_template": true,
   "Targets": {
     "Pdf": {
       "template_folder": "_themes.pdf"
     }
   },
-  "need_generate_intellisense": false
+  "need_generate_intellisense": false,
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  }
 }

.openpublishing.redirection.json

@@ -0,0 +1,24 @@
+---
+title: Create chatbots from Power Apps | Microsoft Docs
+description: Provides information about how you can use AI Builder in Power Apps.
+author: iaanw
+ms.service: powerapps
+ms.topic: conceptual
+ms.custom: 
+ms.date: 06/26/2020
+ms.author: iawilt
+ms.reviewer: mvakoc
+---
+# Create chatbots from Power Apps
+
+Power Virtual Agents allows you to quickly create and maintain intelligent chatbots using a no-code interface. App makers can create and manage their chatbots directly from [Power Apps](https://make.powerapps.com). 
+
+![Chatbots from Power Apps](media/chatbots.png "Chatbots from Power Apps")
+
+You can create and manage your chatbots using the **Chatbots** option in the left navigation pane.
+
+- To create a chatbot, select **Chatbots**, then **Create**, and then select **New chatbot**. This will take you directly to the Power Virtual Agents portal where you can create your chatbot. For more information, see [Create a bot in Power Virtual Agents](https://docs.microsoft.com/power-virtual-agents/authoring-first-bot)
+
+- After you have chatbots in your environment, you'll be able to view them by selecting **Chatbots** and then **List**. You can navigate directly to the Power Virtual Agents portal to update your bot or view analytics.
+
+More information: [Power Virtual Agents docs](https://docs.microsoft.com/power-virtual-agents)

powerapps-docs/chatbots.md

@@ -27,6 +27,10 @@
       href: use-fetchxml-left-outer-join-query-records-not-in.md
     - name: Page large result sets with FetchXML
       href: org-service/page-large-result-sets-with-fetchxml.md
+    - name: Paging behaviors and ordering
+      href: org-service/paging-behaviors-and-ordering.md
+    - name: Use column comparison in queries
+      href: column-comparison.md
   - name: "Use SQL to query data (Preview)"
     href: cds-sql-query.md
   - name: Saved Queries
@@ -302,37 +306,6 @@
     href: best-practices/work-with-metadata/index.md
 - name: Introduction to solutions
   href: introduction-solutions.md
-  items:
-  - name: Dependency tracking for solution components
-    href: dependency-tracking-solution-components.md
-  - name: Removing dependencies
-    href: removing-dependencies.md
-  - name: Maintain managed solutions
-    href: maintain-managed-solutions.md
-  - name: Organize your solutions
-    href: organize-solutions.md
-  - name: Organize your team to develop solutions
-    href: organize-team-develop-solutions.md
-  - name: Use managed properties
-    href: use-managed-properties.md
-  - name: Understand how managed solutions are merged
-    href: understand-managed-solutions-merged.md
-  - name: Create solutions that support multiple languages
-    href: create-solutions-support-multiple-languages.md
-  - name: How to manage solutions
-    items:
-    - name: Create, export, or import an unmanaged solution
-      href: create-export-import-unmanaged-solution.md
-    - name: Uninstall or delete a solution
-      href: uninstall-delete-solution.md
-    - name: Work with solutions
-      href: work-solutions.md
-    - name: Create, install, and update a managed solution
-      href: create-install-update-managed-solution.md
-    - name: Create patches to simplify solution updates
-      href: create-patches-simplify-solution-updates.md
-    - name: When to edit the customizations file
-      href: when-edit-customization-file.md
 - name: Publish and monitor your (ISV) app
   items:
   - name: Publish your app on AppSource

powerapps-docs/developer/common-data-service/TOC.yml

@@ -1,7 +1,7 @@
 ---
 title: "Use OAuth with Common Data Service (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Learn how to authenticate using OAuth with Common Data Service" # 115-145 characters including spaces. This abstract displays in the search result.
-ms.custom: ""
+ms.custom: has-adal-ref
 ms.date: 10/31/2018
 ms.reviewer: "pehecke"
 ms.service: powerapps

powerapps-docs/developer/common-data-service/authenticate-oauth.md

@@ -31,7 +31,7 @@ search.app:
 
 ## Symptoms
 
-Due to their long-running nature, using <xref:Microsoft.Xrm.Sdk.Messages.ExecuteMultipleRequest> or <xref:Microsoft.Xrm.Sdk.Messages.ExecuteTransactionRequest> message request classes within the context of a plug-in or workflow activity expose sandbox-isolated plug-in types to the two-minute (12000ms) channel timeout exception and can degrade the user experience for synchronous registrations.
+Due to their long-running nature, using <xref:Microsoft.Xrm.Sdk.Messages.ExecuteMultipleRequest> or <xref:Microsoft.Xrm.Sdk.Messages.ExecuteTransactionRequest> message request classes within the context of a plug-in or workflow activity expose sandbox-isolated plug-in types to the two-minute (120000ms) channel timeout exception and can degrade the user experience for synchronous registrations.
 
 
 <a name='guidance'></a>

powerapps-docs/developer/common-data-service/best-practices/business-logic/avoid-batch-requests-plugin.md

@@ -56,7 +56,7 @@ Deleting and recreating a step in the source instance (test, dev, preprod) will
 
 ![Duplicate Plug-in Step Registration](../media/duplicate-plugin-registration-step.png)
 
-Manually creating the `SDKMessageProcessingSteps` with a new GUID or updating the existing GUID within the `customizations.xml` file will result in a duplicate step being registered. These types of tasks are unsupported as outlined in [When to edit the customizations file](/powerapps/developer/model-driven-apps/when-edit-customization-file).
+Manually creating the `SDKMessageProcessingSteps` with a new GUID or updating the existing GUID within the `customizations.xml` file will result in a duplicate step being registered. These types of tasks are unsupported as outlined in [When to edit the customizations file](/power-platform/alm/when-edit-customization-file).
 
 <a name='additional'></a>
 

powerapps-docs/developer/common-data-service/best-practices/business-logic/do-not-duplicate-plugin-step-registration.md

@@ -31,4 +31,4 @@ This list below contains all of the best practices and guidance around integrati
 |[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
 
 ### See Also
-[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
+[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />

powerapps-docs/developer/common-data-service/best-practices/work-with-data/index.md

@@ -32,7 +32,7 @@ S2S authentication means you don’t need to use a paid Power Apps user license
 |   Scenario    |   Description  |
 |---------------|---------------|
 | Multi-Tenant  | This is the most common scenario and the one which is used for apps distributed using Microsoft AppSource.<br /><br /> Each Common Data Service tenant is associated with an Azure AD tenant. Your web application or service is registered with your Azure AD tenant.<br /><br /> In this scenario any Common Data Service tenant can potentially use your multi-tenant application after they grant consent for the application to access data in their tenant.                                                           |
-| Single-Tenant | This scenario typically applies to Common Data Service environments that want to develop apps for their own tenant and don’t intend to distribute them to other [Common Data Service environments.<br /><br /> An enterprise can create a web application or service to connect to all the Common Data Service environments for their tenant.<br /><br /> In this scenario, your web application or service will only be able to connect to Common Data Service environments using the same Azure AD tenant. |
+| Single-Tenant | This scenario typically applies to Common Data Service environments that want to develop apps for their own tenant and don’t intend to distribute them to other Common Data Service environments.<br /><br /> An enterprise can create a web application or service to connect to all the Common Data Service environments for their tenant.<br /><br /> In this scenario, your web application or service will only be able to connect to Common Data Service environments using the same Azure AD tenant. |
 
  Both scenarios have common elements but there are some differences. Since multi-tenant is the most common scenario, the [Use Multi-Tenant Server-to-server authentication](use-multi-tenant-server-server-authentication.md) content describes how you can use S2S in this scenario and include notes where the options for single-tenant configuration is different. 
 

powerapps-docs/developer/common-data-service/build-web-applications-server-server-s2s-authentication.md

@@ -0,0 +1,70 @@
+---
+title: "Use column comparison in queries (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "Learn how to compare columns when querying business data." # 115-145 characters including spaces. This abstract displays in the search result.
+ms.custom: ""
+ms.date: 07/08/2020
+ms.reviewer: "pehecke"
+ms.service: powerapps
+ms.topic: "article"
+author: "NHelgren" # GitHub ID
+ms.author: "nhelgren" # MSFT alias of Microsoft employees only
+manager: "mayadu" # MSFT alias of manager or PM counterpart
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Use column comparison in queries
+
+In the Common Data Service, users can perform a column comparison for the
+following condition operators using FetchXML, Web API, or the SDK API:
+
+- Equal
+- NotEqual
+- GreaterThan
+- GreaterEqual
+- LessThan
+- LessEqual
+
+This will allow the comparison of an attribute against a specific value and
+return all found records, or allow the comparison of two attributes to return
+all records with a matching value.
+
+## Limitations
+
+Listed below are the limitations for the current Common Data Service column comparison support.
+
+- You can only compare columns within a single entity
+- Only two columns may be compared at a time.
+- Multi-value condition operators are not supported (i.e., "in").
+- Extended condition operators are not supported (i.e., "creditlimit \> spends+1000").
+- Incompatible attribute comparison is not supported. For example, "int vs. int" attributes is a valid comparison but "int vs. string" attributes is not a valid comparison.
+
+## Column comparison using FetchXML
+
+The following example shows how to compare columns using FetchXML:
+
+```xml
+<fetch>
+  <entity name='contact' >
+    <attribute name='firstname' />
+    <filter>
+      <condition attribute='firstname' operator='eq' valueof='lastname'/>
+    </filter>
+  </entity>
+</fetch>
+```
+
+For FetchXML requests, a new node `valueof` has been added inside the condition
+node. The `valueof` tag is used to identify the attribute that is being compared
+to the selected attribute. In the above example, the 'firstname' column is being
+compared against the 'lastname' column and will return any records that contain
+the same value across both attributes.
+
+### See Also
+
+[Use FetchXML to construct a query](use-fetchxml-construct-query.md)  
+[Column comparison using the Web API](webapi/query-data-web-api.md#column-comparison-using-the-web-api)  
+[Column comparison using the SDK API](org-service/use-conditionexpression-class.md#column-comparison-using-the-sdk-api)