Merge branch 'live' into patch-2

Author: Mattp123

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

@@ -33,6 +33,8 @@
       href: column-comparison.md
     - name: FetchXML search item limit
       href: quick-find-limit.md
+    - name: Improve FetchXML request performance
+      href: fetchxml-performance.md
   - name: "Use SQL to query data (Preview)"
     href: cds-sql-query.md
   - name: Saved Queries
@@ -351,7 +353,7 @@
       href: authenticate-dot-net-framework.md
     - name: Use OAuth
       href: authenticate-oauth.md
-    - name: Office365 authentication with WS-Trust
+    - name: Microsoft 365 authentication with WS-Trust
       href: authenticate-office365-deprecation.md
   - name: "Tutorial: Register an app with Azure Active Directory"
     href: walkthrough-register-app-azure-active-directory.md

powerapps-docs/developer/common-data-service/authenticate-dot-net-framework.md

@@ -29,7 +29,7 @@ With the `Xrm.Tooling` classes, use the <xref:Microsoft.Xrm.Tooling.Connector>.<
 
 The `Xrm.Tooling` classes provide many benefits including:
 - You can define connection information using a connection string.
-- Supports both OAuth and Office 365 claims-based authentication.
+- Supports both OAuth and Microsoft 365 claims-based authentication.
 - Thread safety for actions performed in a multithreaded environment. 
 - A common Windows Presentation Foundation (WPF) login control for a consistent sign-in experience from your Windows client applications.
 - Supports for secure storage of the sign-in credentials and reuse of the stored credentials to automatically sign in after initial sign in.

powerapps-docs/developer/common-data-service/authenticate-office-365-users-cds-web-services.md

@@ -1,5 +1,5 @@
 ---
-title: "Authenticate Office 365 users with Common Data Service web services (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+title: "Authenticate Microsoft 365 users with Common Data Service web services (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "<Description>" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
 ms.date: 10/31/2018
@@ -15,7 +15,7 @@ search.app:
   - PowerApps
   - D365CE
 ---
-# Authenticate Office 365 users with Common Data Service web services
+# Authenticate Microsoft 365 users with Common Data Service web services
 
 <!-- https://docs.microsoft.com/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services 
 

powerapps-docs/developer/common-data-service/authenticate-office365-deprecation.md

@@ -1,5 +1,5 @@
 ---
-title: "Use of Office365 authentication with the WS-Trust security protocol (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+title: "Use of Microsoft 365 authentication with the WS-Trust security protocol (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Describes deprecation of the WS-Trust security protocol and the authentication code changes required in applications."
 ms.custom: ""
 ms.date: 02/05/2020
@@ -16,7 +16,7 @@ search.app:
   - D365CE
 ---
 
-# Use of Office365 authentication with the WS-Trust security protocol
+# Use of Microsoft 365 authentication with the WS-Trust security protocol
 
 Use of the WS-Trust authentication security protocol when connecting to Common
 Data Service is no longer recommended and has been
@@ -85,7 +85,7 @@ Service.
     Password=passcode;Url=https://contosotest.crm.dynamics.com;AppId=51f81489-12ee-4a9e-aaae-a2591f45987d;
     RedirectUri=app://58145B91-0C36-4500-8554-080854F2AC97;LoginPrompt=Auto"`
 
-        This will be your fastest way to update the code. Note that LoginPrompt can be set to “never” to simulate the way that the Office 365 behavior worked.
+        This will be your fastest way to update the code. Note that LoginPrompt can be set to “never” to simulate the way that the Microsoft 365 behavior worked.
 
         The AppId and RedirectUri provided above are examples of working application registration values. These values work everywhere our online services are deployed. However, they are provided here as examples and you are encouraged to create your own application registration in Azure Active Directory (AAD) for applications running in your tenant.<p/>
 

powerapps-docs/developer/common-data-service/authentication.md

@@ -25,7 +25,7 @@ How you authenticate depends on the software framework you use and which web ser
 If your client application uses the .NET Framework, you have two options:
 
 - OAuth
-- Office 365
+- Microsoft 365
 
 ### OAuth
 
@@ -39,13 +39,13 @@ OAuth is also required to support:
 
 More information: [Use OAuth with Common Data Service](authenticate-oauth.md)
 
-### Office 365
+### Microsoft 365
 
-Office 365 authentication requires using the .NET Framework SDK assemblies with the SOAP web services only.
+Microsoft 365 authentication requires using the .NET Framework SDK assemblies with the SOAP web services only.
 
-Using Office 365 authentication does not require that your register your applications as OAuth does. You must simply provide a User Principal Name (UPN) and password for a valid user.
+Using Microsoft 365 authentication does not require that your register your applications as OAuth does. You must simply provide a User Principal Name (UPN) and password for a valid user.
 
-More information: [Authentication with .NET Framework applications](authenticate-dot-net-framework.md), [Use of Office365 authentication with the WS-Trust security protocol](authenticate-office365-deprecation.md)
+More information: [Authentication with .NET Framework applications](authenticate-dot-net-framework.md), [Use of Microsoft 365 authentication with the WS-Trust security protocol](authenticate-office365-deprecation.md)
 
 ## All other software frameworks
 

powerapps-docs/developer/common-data-service/cds-sql-query.md

@@ -2,7 +2,7 @@
 title: "Use SQL to query data (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Learn how to query Common Data Service entity data using SQL." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 05/26/2020
+ms.date: 09/25/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -20,8 +20,13 @@ search.app:
 
 [!INCLUDE[cc-beta-prerelease-disclaimer](../../includes/cc-beta-prerelease-disclaimer.md)]
 
+> [!WARNING]
+> A problem has been identified with the Tabular Data Stream (TDS) endpoint. This feature is globally disabled, and we are working urgently to address the issue. This topic will be updated when the issue is resolved or when we have more information to share.
+
 A SQL data connection is available on the Common Data Service endpoint. The SQL connection provides read-only access to the entity data of the target Common Data Service environment. This allows you to write and execute SQL queries against the entity data table. Table columns provide the attribute data of the entity. No custom views of the data have been provided.
 
+
+
 > [!IMPORTANT]
 > - This is a preview feature, and isn't available in all regions.
 > - [!INCLUDE[cc_preview_features_definition](../../includes/cc-preview-features-definition.md)]

powerapps-docs/developer/common-data-service/connect-microsoft-office-365.md

@@ -1,6 +1,6 @@
 ---
-title: "Connect with Microsoft Office 365 and Common Data Service (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "The Microsoft Office 365 portal provides a single sign-on experience for Office 365 customers where they can sign in once and access any Office 365 application" # 115-145 characters including spaces. This abstract displays in the search result.
+title: "Connect with Microsoft 365 and Common Data Service (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "The Microsoft 365 portal provides a single sign-on experience for Microsoft 365 customers where they can sign in once and access any Microsoft 365 application" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
 ms.date: 10/31/2018
 ms.reviewer: "pehecke"
@@ -15,16 +15,16 @@ search.app:
   - PowerApps
   - D365CE
 ---
-# Connect with Microsoft Office 365 and Common Data Service
+# Connect with Microsoft 365 and Common Data Service
 
-Common Data Service is part of the Office 365 collaboration and productivity tools. The [Microsoft Office 365 portal](https://www.microsoft.com/office365) provides a single sign-on experience for Office 365 customers where they can sign in once and access any Office 365 application, including Common Data Service. In addition, system user accounts in Common Data Service can be provisioned in the [Microsoft Online Services](https://portal.microsoftonline.com/) admin portal.  
+Common Data Service is part of the Microsoft 365 collaboration and productivity tools. The [Microsoft 365 portal](https://www.microsoft.com/office365) provides a single sign-on experience for Microsoft 365 customers where they can sign in once and access any Microsoft 365 application, including Common Data Service. In addition, system user accounts in Common Data Service can be provisioned in the [Microsoft Online Services](https://portal.microsoftonline.com/) admin portal.  
 
  Using federation, applications can connect to Common Data Service using the same system user identities and credentials available in an Azure Active Directory based network. More information: [Single sign-on roadmap](https://technet.microsoft.com/library/hh967643.aspx).  
 
 ## In This Section  
- [Common Data Service Integration with Office 365](online-integration-office-365.md)  
+ [Common Data Service Integration with Microsoft 365](online-integration-office-365.md)  
 
- [Authenticate Office 365 Users with Common Data Service Web Services](/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services)  
+ [Authenticate Microsoft 365 Users with Common Data Service Web Services](/dynamics365/customer-engagement/developer/authenticate-office-365-users-customer-engagement-web-services)  
 
  [Sample: Authenticate Users with Common Data Service Web Services](/dynamics365/customer-engagement/developer/sample-authenticate-users-web-services)  
 

powerapps-docs/developer/common-data-service/fetchxml-performance.md

@@ -0,0 +1,117 @@
+---
+title: Improve FetchXML request performance | Microsoft Docs
+description: Learn how developers can improve FetchXML request performance when using Common Data Service.
+author: NHelgren
+manager: annbe
+ms.service: powerapps
+ms.topic: article
+ms.date: 09/28/2020
+ms.author: nhelgren
+ms.reviewer: "pehecke"
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Improve FetchXML request performance
+
+An option available in FetchXML requests called *LateMaterialize* allows you to break up such
+requests into smaller more usable segments which can improve the performance of long running FetchXML requests.
+
+> [!NOTE]
+> Performance improvements depend on the data distribution for each
+> participating entity and linked entity. Late materialization may not always
+> provide a performance benefit. It is best used if you are experiencing
+> performance issues with your existing fetch request.
+
+Executing a traditional fetch for a given number of the top entity records will pull all
+the columns in the select list that meet the filter criteria. Let’s say you are
+pulling the top 500 records on an entity that has 100 columns and 100K rows
+that meet the filter criteria, this request can cause issues in two ways:
+
+- The 99.5K rows will pull all columns, even though you only need to populate
+  the select list for 500 rows when returning to the client.
+
+- Query Optimizer can generate an arbitrary order when retrieving the child
+  columns, resulting in an undesired data order.
+
+Using `LateMaterialize` allows you to create a fetch that will:
+
+- First pull only the primary ID of the top number of records specified.
+
+- Select only the columns of data needed based on the primary IDs that were
+  retrieved. For example, where only 5 columns are needed for display in the form.
+
+By pulling only the needed data after the primary IDs are collected, the
+retrieval is much faster as data that is not needed for the current operation is
+excluded.
+
+This is most beneficial when:
+
+- The entity you are querying has one or more links to other entities for column data.
+
+- There are many columns in the entity.
+
+- The entity contains logical attributes.
+
+## Syntax
+
+```xml
+<fetch version="1.0" output-format="xml-platform" latematerialize="true"
+ mapping="logical" distinct="true">
+
+  <entity name="[entity]">​
+    <attribute name="[attribute]" />
+​
+    <link-entity name="[entity]" from="[linked entity]" to="[linked entityid]"
+                 link-type="outer" alias="[alias]">​
+      <attribute name="[name of linked entity column]" />​
+    </link-entity>
+​
+    <filter type=[filter type]>​
+      <condition attribute="[column]" operator="[operator]" value="[value]"/> ​
+    </filter>​
+  </entity>
+​
+</fetch>
+```
+
+## Sample
+
+```XML
+<fetch version="1.0" output-format="xml-platform" latematerialize="true"
+       mapping="logical" distinct="true">
+
+  <entity name="account">​
+    <attribute name="accountnumber" />​
+    <attribute name="createdby" />​
+    <attribute name="ownerid" />​
+
+    <link-entity name="account" from="accountid" to="parentaccountid"
+                 link-type="outer" alias="oaccount">​
+      <attribute name="createdby" />
+​
+      <link-entity name="account" from="accountid" to="accountid" link-type="outer"
+                 alias="oaccount1">​
+        <attribute name="createdby" />​
+        <attribute name="accountid" />​
+        <attribute name="name" />​
+      </link-entity>​
+    </link-entity>​
+
+    <link-entity name="account" from="accountid" to="accountid" link-type="outer"
+                 alias="oaccount2"/>
+​
+    <filter type='and'>​
+      <condition attribute="statecode" operator="eq" value="2"/> ​
+    </filter>​
+  </entity>​
+
+</fetch>
+```
+
+### See Also
+
+[Use FetchXML to construct a query](use-fetchxml-construct-query.md)

powerapps-docs/developer/common-data-service/online-integration-office-365.md

@@ -1,5 +1,5 @@
 ---
-title: "Integration with Office 365 (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+title: "Integration with Microsoft 365 (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "<Description>" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
 ms.date: 10/31/2018
@@ -15,7 +15,7 @@ search.app:
   - PowerApps
   - D365CE
 ---
-# Integration with Office 365
+# Integration with Microsoft 365
 
 <!-- https://docs.microsoft.com/dynamics365/customer-engagement/developer/online-integration-office-365 
 Do we even need this topic?

powerapps-docs/developer/common-data-service/online-management-api/authentication.md

@@ -84,7 +84,7 @@ These are the broad steps to authenticate to the Online Management API service.
     }
     ```
 
-You are all set to execute messages against the Online Management API. For a sample code that demonstrates how to retrieve all Common Data Service environments in your Office 365 tenant, see [Quick Start Sample: Retrieve environments in your tenant](sample-quick-start.md)
+You are all set to execute messages against the Online Management API. For a sample code that demonstrates how to retrieve all Common Data Service environments in your Microsoft 365 tenant, see [Quick Start Sample: Retrieve environments in your tenant](sample-quick-start.md)
 
 
 ### Related Topics