Merge branch 'master' into canvasapp-1919658

Author: tapanm-MSFT

.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

@@ -8,7 +8,6 @@ ms.custom:
 ms.date: 06/26/2020
 ms.author: iawilt
 ms.reviewer: mvakoc
-ms.custom: pva, power-apps
 ---
 # Create chatbots from Power Apps
 

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

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

@@ -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)

powerapps-docs/developer/common-data-service/column-comparison.md

@@ -39,7 +39,7 @@ There are three levels where auditing can be configured: organization, entity, a
 
  The following table lists the non-customizable entities that cannot be audited. This table was obtained by testing for a `CanModifyAuditSettings` attribute value of `false` on each entity’s metadata.  
 
-||  
+|Non-customizable entities|  
 |-|  
 |ActivityPointer|  
 |Annotation|  

powerapps-docs/developer/common-data-service/configure-entities-attributes-auditing.md

@@ -70,6 +70,10 @@ The `CascadeConfiguration` (<xref:Microsoft.Xrm.Sdk.Metadata.CascadeConfiguratio
 > deactivated when the reassignment occurs. The new owner of the record will need to reactivate the workflow or business rule 
 > if they want to continue using it.
 
+
+> [!NOTE]
+> When performing a merge between two custom entities, DateTime values will not merge. The DateTime of the target record will remain unchanged.
+
 <a name="BKMK_ReparentAction"></a>   
 ### About the reparent action  
  The reparent action is very similar to the share action except that it deals with the inherited read access rights instead of explicit read access rights. The reparent action is when you change the value of the referencing attribute in a parental relationship. When a reparent action occurs, the desired scope of the inherited read access rights for related entities might change. The cascade actions related to the reparent action refer to changes to read access rights for the entity record and any entity records related to it.