Merge branch 'master' into 2061763

Author: tapanm-MSFT

powerapps-docs/developer/data-platform/TOC.yml

@@ -219,7 +219,6 @@
       href: walkthrough-configure-azure-sas-integration.md
     - name: "Tutorial: Register an Azure-aware plug-in using the Plug-in Registration Tool"
       href: walkthrough-register-azure-aware-plug-in-using-plug-in-registration-tool.md
-
     - name: "Tutorial: Update a service endpoint imported from a solution"
       href: walkthrough-update-service-endpoint-imported-solution.md
   - name: Use Web Hooks
@@ -395,7 +394,7 @@
       href: authenticate-dot-net-framework.md
     - name: Use OAuth
       href: authenticate-oauth.md
-    - name: Use Microsoft 365 (WS-Trust)
+    - name: Use Office365 (WS-Trust)
       href: authenticate-office365-deprecation.md
   - name: "Tutorial: Register an app with Azure Active Directory"
     href: walkthrough-register-app-azure-active-directory.md
@@ -460,4 +459,4 @@
   - name: Customization solutions file schema
     href: customization-solutions-file-schema.md
   - name: FetchXML schema
-    href: fetchxml-schema.md
+    href: fetchxml-schema.md

powerapps-docs/developer/data-platform/authenticate-office365-deprecation.md

@@ -1,6 +1,6 @@
 ---
-title: "Use Microsoft 365 authentication with Microsoft Dataverse (Microsoft Dataverse) | 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 code changes required in applications that use Microsoft 365 authentication."
+title: "Use Office365 authentication with Microsoft Dataverse (Microsoft Dataverse) | 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 code changes required in applications that use Office365 authentication."
 ms.custom: ""
 ms.date: 03/23/2021
 ms.reviewer: "pehecke"
@@ -16,10 +16,12 @@ search.app:
   - D365CE
 ---
 
-# Use Microsoft 365 authentication with Microsoft Dataverse
+# Use Office365 authentication with Microsoft Dataverse
 
 Use of the WS-Trust authentication security protocol when connecting to Microsoft Dataverse is no longer recommended and has been deprecated; see the [announcement](/power-platform/important-changes-coming#deprecation-of-office365-authentication-type-and-organizationserviceproxy-class-for-connecting-to-common-data-service).
 
+Additionally, the WS-Trust protocol does not support modern forms of multi-factor authentication and Azure AD Conditional Access controls to customer data.
+
 This change impacts custom client applications that use “Office365” authentication and the
 [Microsoft.Xrm.Sdk.Client.OrganizationServiceProxy](/dotnet/api/microsoft.xrm.sdk.client.organizationserviceproxy) or
 [Microsoft.Xrm.Tooling.Connector.CrmServiceClient](/dotnet/api/microsoft.xrm.tooling.connector.crmserviceclient)
@@ -54,8 +56,7 @@ using (OrganizationServiceProxy organizationServiceProxy =
 ## What should I do to fix my application code if affected?
 
 There are very straight forward ways to modify your application’s code to use
-the recommended connection interface for authentication with Common Data
-Service.
+the recommended connection interface for authentication with Dataverse.
 
 - If your code uses an [Microsoft.Xrm.Sdk.Client.OrganizationServiceProxy](/dotnet/api/microsoft.xrm.sdk.client.organizationserviceproxy) instance:
 
@@ -79,9 +80,9 @@ 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 Microsoft 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 Office365 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/>
+        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 (Azure AD) for applications running in your tenant.<p/>
 
     - When we announce it, update to the latest [Microsoft.CrmSdk.XrmTooling.CoreAssembly](https://www.nuget.org/packages/Microsoft.CrmSdk.XrmTooling.CoreAssembly/) NuGet package that includes auto redirect support. This library will redirect an authentication type of Office365 to OAuth and use the example AppId and Redirect URI automatically. This capability is planned for the 9.2.x version of the Microsoft.CrmSdk.XrmTooling.CoreAssembly package.
 
@@ -98,4 +99,4 @@ To do this, you must first register the application user (Service Principal) in
 We will be monitoring the Power Apps ALM and ProDev community [forums](https://powerusers.microsoft.com/t5/Power-Apps-Component-Framework/bd-p/pa_component_framework). Please take a look there to get help on how to solve various issues or post a
 question.
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/best-practices/business-logic/develop-iplugin-implementations-stateless.md

@@ -5,6 +5,7 @@ services: ''
 suite: powerapps
 documentationcenter: na
 author: jowells
+ms.reviewer: phecke
 manager: austinj
 editor: ''
 tags: ''

powerapps-docs/developer/data-platform/org-service/samples/Create-retrieve-entity-relationships.md

@@ -1,8 +1,8 @@
 ---
-title: "Sample: Create and retrieve entity relationships  (Microsoft Dataverse) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "This sample shows how to create and retrieve entity relationships." # 115-145 characters including spaces. This abstract displays in the search result.
+title: "Sample: Create and retrieve table relationships  (Microsoft Dataverse) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "This sample shows how to create and retrieve table relationships." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 10/31/2018
+ms.date: 06/17/2021
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "samples"
@@ -16,11 +16,11 @@ search.app:
   - D365CE
 ---
 
-# Create and retrieve entity relationships
+# Create and retrieve table relationships
 
 [!INCLUDE[cc-data-platform-banner](../../../../includes/cc-data-platform-banner.md)]
 
-This sample shows how to create and retrieve entity relationships. The following methods are used to create and retrieve the relationships:
+This sample shows how to create and retrieve table relationships. The following methods are used to create and retrieve the relationships:
 
 - [CreateOneToManyRequest](/dotnet/api/microsoft.xrm.sdk.messages.createonetomanyrequest?view=dynamics-general-ce-9)
 - [CreateManyToManyRequest](/dotnet/api/microsoft.xrm.sdk.messages.createmanytomanyrequest?view=dynamics-general-ce-9)
@@ -31,13 +31,15 @@ This sample shows how to create and retrieve entity relationships. The following
 
 You can download the sample from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/CreateRetrieveEntityRelationships).
 
+[!INCLUDE[cc-terminology](../../includes/cc-terminology.md)]
+
 ## How to run this sample
 
 [!include[cc-how-to-run-samples](../../includes/cc-how-to-run-samples.md)]
 
 ## What this sample does
 
-The `CreateOneToManyRequest`, `CreateManyToManyRequest`, `CanManyToManyRequest`, `CreateOneToManyRequest`, `CanBeReferencedRequest`, `CanBeReferencingRequest`, and `RetrieveRelationshipRequest` messages are intended to be used in a scenario where it contains the data that is needed to create and retrieve entity relationships.
+The `CreateOneToManyRequest`, `CreateManyToManyRequest`, `CanManyToManyRequest`, `CreateOneToManyRequest`, `CanBeReferencedRequest`, `CanBeReferencingRequest`, and `RetrieveRelationshipRequest` messages are intended to be used in a scenario where it contains the data that is needed to create and retrieve table relationships.
 
 ## How this sample works
 
@@ -51,13 +53,13 @@ Checks for the current version of the org.
 
 1. The `CreateOneToManyRequest` method creates a new One-to-Many (1:N) relationship. 
 2. The `CreateManyToManyRequest` method creates a new Many-To-Many (N:N) relationship.
-3. The `EligibleCreateManyToManyRelationship` method verifies whether entities can participate in N:N relationship.
-4. The `RetrieveRelationshipRequest` method retrieves the two entity relationships previously created.
+3. The `EligibleCreateManyToManyRelationship` method verifies whether tables can participate in N:N relationship.
+4. The `RetrieveRelationshipRequest` method retrieves the two tables relationships previously created.
 
 
 ### Clean up
 
-Display an option to delete the records created in the [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the records created in the [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/add-record-queue-early-bound.md

@@ -2,7 +2,7 @@
 title: "Sample: Add a record to queue (Microsoft Dataverse) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "This sample shows how to add a record to a queue." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 10/31/2018
+ms.date: 06/17/2021
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "samples"
@@ -21,6 +21,8 @@ search.app:
 
 This sample shows how to add a record to a queue. It creates source and destination queues. It adds a letter activity to the source queue and then moves it to the destination queue. You can download the sample from [here](https://github.com/Microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/RecordToQueue).
 
+[!INCLUDE[cc-terminology](../../includes/cc-terminology.md)]
+
 This sample requires additional users that are not in your system. Create the users manually in **Microsoft 365** in order to run the sample without any errors. For this sample, create a user profile **as is** shown below. 
 
 **First Name**: Kevin<br/>
@@ -34,7 +36,7 @@ This sample requires additional users that are not in your system. Create the us
 
 ## What this sample does
 
-The `AddToQueueRequest` message is intended to be used in a scenario where it contains data that is needed to move an entity record from a source queue to destination queue.
+The `AddToQueueRequest` message is intended to be used in a scenario where it contains data that is needed to move a table record from a source queue to destination queue.
 
 ## How this sample works
 
@@ -44,8 +46,8 @@ In order to simulate the scenario described in [What this sample does](#what-thi
 
 1. Checks for the current version of the org.
 2. The `Queue` method creates source and destination queues and store their returned GUIDs in variable.
-3. Creates a Letter entity.
-4. The `AddToQueueRequest` method adds an entity record into a queue, in this sample it associates the letter with first queue.
+3. Creates a Letter table.
+4. The `AddToQueueRequest` method adds a table record into a queue, in this sample it associates the letter with first queue.
 5. Retrieves the user created manually in **Microsoft 365** for assigning the queue items to the user's queue.
 
 ### Demonstrate
@@ -55,7 +57,7 @@ In order to simulate the scenario described in [What this sample does](#what-thi
 
 ### Clean up
 
-Display an option to delete the sample data that is created in [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the sample data that is created in [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/add-security-principal-user-team-queue-early-bound.md

@@ -21,6 +21,8 @@ search.app:
 
 This sample showcases how to give a user or a team access to a queue. The [AddPrincipalToQueueRequest](/dotnet/api/microsoft.crm.sdk.messages.addprincipaltoqueuerequest?view=dynamics-general-ce-9) adds the specified principal to the list of queue members. If the passed-in security principal is a team each member of the team is added to the queue. You can download the sample from [here](https://github.com/Microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/AddSecurityPrincipalToQueue).
 
+[!INCLUDE[cc-terminology](../../includes/cc-terminology.md)]
+
 ## How to run this sample
 
 [!include[cc-how-to-run-samples](../../includes/cc-how-to-run-samples.md)]
@@ -48,7 +50,7 @@ The `AddPrincipalToQueueRequest` method adds the team to the queue.
 
 ### Clean up
 
-Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/assign-chart-to-another-user.md

@@ -22,6 +22,8 @@ search.app:
 
 This sample shows how to assign a user-owned visualization to another using the [AssignRequest](/dotnet/api/microsoft.crm.sdk.messages.assignrequest?view=dynamics-general-ce-9) message. You can download the sample from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/AssignChartToAnotherUser).
 
+[!INCLUDE[cc-terminology](../../includes/cc-terminology.md)]
+
 This sample requires an additional user that isn't available in your system. Create the required user manually in **Microsoft 365** in order to run the sample without any errors. For this sample create a user profile **as is** shown below. 
 
 **First Name**: Kevin<br/>
@@ -45,15 +47,15 @@ In order to simulate the scenario described in [What this sample does](#what-thi
 
 1. Checks for the current version of the org.
 2. The `CreateRequiredRecords` method creates a sample account and some opportunity records for the visualization.
-3. The `newUserOwnedVisualization` method creates the visualization entity instance.
+3. The `newUserOwnedVisualization` method creates the visualization table instance.
 
 ### Demonstrate
 
 The `AssignRequest` method assigns the visualization or chart to the newly created user.
 
 ### Clean up
 
-Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/assign-dashboard-to-another-user.md

@@ -22,6 +22,8 @@ search.app:
 
 This sample shows how to assign a user-owned visualization to another using the [AssignRequest](/dotnet/api/microsoft.crm.sdk.messages.assignrequest?view=dynamics-general-ce-9) message. Because you can’t delete a user-owned dashboard that is assigned to another user, this sample shows how to use impersonation to delete the user-owned dashboard. You can download the sample from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/AssignUserOwnedDashboardToAnother).
 
+[!INCLUDE[cc-terminology](../../includes/cc-terminology.md)]
+
 This sample requires an additional user that isn't available in your system. Create the required user manually in **Microsoft 365** in order to run the sample without any errors. For this sample create a user profile **as is** shown below. 
 
 **First Name**: Kevin<br/>
@@ -44,7 +46,7 @@ In order to simulate the scenario described in [What this sample does](#what-thi
 ### Setup
 
 1. Checks for the current version of the org.
-2. The `CreateRequiredRecords` method creates entity records that this sample requires.
+2. The `CreateRequiredRecords` method creates table records that this sample requires.
 3. The `mySavedQuery` method grabs the default public view for the opportunities.
 4. The `visualizationQuery` method retrieves the visualizations out of the system. This sample assumes that you have the **Top opportunities**. 
 5. The `_otherUSerId` method creates the user to whom the dashboard will be assigned.
@@ -55,7 +57,7 @@ The `AssignRequest` method assigns the visualization or chart to the newly creat
 
 ### Clean up
 
-Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/associate-security-role-team.md

@@ -24,6 +24,8 @@ This sample shows how to assign a security role to a team by using the [AssignRe
 
 You can download the sample from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/AssociateSecurityRoleToTeam)
 
+[!INCLUDE[cc-terminology](../../includes/cc-terminology.md)]
+
 ## How to run this sample
 
 [!include[cc-how-to-run-samples](../../includes/cc-how-to-run-samples.md)]
@@ -48,7 +50,7 @@ In order to simulate the scenario described in [What this sample does](#what-thi
 
 ### Clean up
 
-Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/associate-security-role-user.md

@@ -55,7 +55,7 @@ In order to simulate the scenario described in [What this sample does](#what-thi
 
 ### Clean up
 
-Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the entities and data created by the sample. You can manually delete the records to achieve the same result.
+Display an option to delete the sample data in [Setup](#setup). The deletion is optional in case you want to examine the tables and data created by the sample. You can manually delete the records to achieve the same result.
 
 
 [!INCLUDE[footer-include](../../../../includes/footer-banner.md)]