Merge remote-tracking branch 'origin/master' into matp-solution-checker-admin-mode

Author: Mattp123

.openpublishing.redirection.json

@@ -44,7 +44,7 @@ A package lets you bundle and deploy multiple files related to your app at once.
 
     ```xml
     <?xml version="1.0" encoding="utf-8"?>
-    <Types xmlns="https://schemas.openxmlformats.org/package/2006/content-types">
+    <Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
       <Default Extension="xml" ContentType="application/octet-stream" />
       <Default Extension="xaml" ContentType="application/octet-stream" />
       <Default Extension="dll" ContentType="application/octet-stream" />

powerapps-docs/developer/common-data-service/create-package-app-appsource.md

@@ -2,7 +2,7 @@
 title: "Work with alternate keys (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "The topic explains about how to create alternate keys for an entity. Alternate keys can be created programmatically or by using the customization tools" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 06/24/2020
+ms.date: 08/01/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -23,7 +23,7 @@ All Common Data Service records have unique identifiers defined as GUIDs. These
 
 ## Create alternate keys  
 
-You can create alternate keys programmatically or by using the customizations tools. For more information about using the customization tools, see [Define alternate keys to reference CRM records](https://technet.microsoft.com/library/29e53691-0b18-4fde-a1d0-7490aa227898.aspx).  
+You can create alternate keys programmatically or by using the customizations tools. For more information about using the customization tools, see [Define alternate keys using Power Apps portal](../../maker/common-data-service/define-alternate-keys-portal.md).
 
 To define alternate keys programmatically, you first have to create an object of type <xref:Microsoft.Xrm.Sdk.Metadata.EntityKeyMetadata> (or use <xref href="Microsoft.Dynamics.CRM.EntityKeyMetadata?text=EntityKeyMetadata EntityType" /> if working with Web API). This class contains the key attributes. Once the key attributes are set, you can use `CreateEntityKey` to create the keys for an entity. This message takes the entity name and `EntityKeyMetadata` values as input to create the key.  
 
@@ -54,7 +54,7 @@ You should be aware of the following constraints when creating alternate keys:
 
 - **Unicode characters in key value**
 
-  If the data within a field that is used in an alternate key will contain one of the following characters `/`,`<`,`>`,`*`,`%`,`&`,`:`,`\\` then update or upsert (PATCH) actions will not work.  If you only need uniqueness then this approach will work, but if you need to use these keys as part of data integration then it is best to create the key on fields that won't have data with those characters.
+  If the data within a field that is used in an alternate key will contain one of the following characters `/`,`<`,`>`,`*`,`%`,`&`,`:`,`\\`,`?` then retrieve (`GET`), update or upsert (`PATCH`) actions will not work.  If you only need uniqueness then this approach will work, but if you need to use these keys as part of data integration then it is best to create the key on fields that won't have data with those characters.
 
 <a name="BKMK_crud"></a>   
 

powerapps-docs/developer/common-data-service/define-alternate-keys-entity.md

@@ -2,7 +2,7 @@
 title: "Use the ConditionExpression class (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "Read how you can use the ConditionExpression class to compare an attribute to a value or set of values by using an operator, such as "equal to" or "greater than"" # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 10/31/2018
+ms.date: 08/03/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -105,20 +105,28 @@ public ConditionExpression
 )
 ```
 
-In the SDK, two APIs are introduced to support column comparison. The
-first identifies the original attribute, the second allows
-for the inclusion of the attribute you want to compare it against.
+By passing in `true` as the value for the `compareColumns` parameter, the `value` is treated as the
+name of the second attribute to compare the values in `attributeName` to. Pass in `false` to treat it
+as a literal value instead.
 
-If `compareColumns` is passed in as `true`, it will compare the two attributes
-and return all records that match.
+For example:
 
-If a `false` value is passed, it will return all records for one attribute and
-return values that match the provided value.
+```csharp
+new ConditionExpression("firstname", ConditionOperator.Equal, true, "lastname");
+```
+
+This code creates a condition to return only records where the first and last names are the same, while
+
+```csharp
+new ConditionExpression("firstname", ConditionOperator.Equal, false, "John");
+```
+
+creates a condition to return only records where the first name is John.
 
 More information: [Use column comparison in queries](../column-comparison.md)
 
 ### See also  
  [Building Queries](build-queries-with-queryexpression.md)   
  [Build Queries with QueryExpression](build-queries-with-queryexpression.md)   
  [Use the FilterExpression Class](use-filterexpression-class.md)   
- <xref:Microsoft.Xrm.Sdk.Query.ConditionExpression>
+ <xref:Microsoft.Xrm.Sdk.Query.ConditionExpression>

powerapps-docs/developer/common-data-service/org-service/use-conditionexpression-class.md

@@ -97,6 +97,9 @@ To create an unlicensed "application user" in your environment, follow these ste
 
 7. Before exiting the user form, choose **MANAGE ROLES** and assign a security role to this application user so that the application user can access the desired organization data.
 
+> [!NOTE]
+> In an environment, only one Application User for each Azure AD registered application is supported.
+
 > [!IMPORTANT]
 > When developing a real-world application using S2S, you should use a custom security role which can be stored in a solution and distributed along with your application.
 

powerapps-docs/developer/common-data-service/use-single-tenant-server-server-authentication.md

@@ -93,17 +93,4 @@
 - name: Sample data
   href: ../sample-data.md #Topic is for both Web API and Organization service
 - name: Samples
-  items:
-  - name: Data operations Sample Templates
-    href: web-api-samples.md
-    items:
-    - name: Basic Operations
-      href: web-api-basic-operations-sample.md
-    - name: Query Data
-      href: web-api-query-data-sample.md
-    - name: Conditional Operations
-      href: web-api-conditional-operations-sample.md
-    - name: Functions and Actions
-      href: web-api-functions-actions-sample.md
-    - name: Samples
-      href: samples/toc.yml
+  href: samples/toc.yml

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

@@ -195,7 +195,7 @@ OData-Version: 4.0
 
 ### See also
 
- [Web API Basic Operations Sample (C#)](samples/basic-operations-csharp.md)   
+ [Web API Basic Operations Sample (C#)](samples/cdswebapiservice-basic-operations.md)   
  [Web API Basic Operations Sample (Client-side JavaScript)](samples/basic-operations-client-side-javascript.md)   
  [Perform operations using the Web API](perform-operations-web-api.md)   
  [Compose Http requests and handle errors](compose-http-requests-handle-errors.md)   

powerapps-docs/developer/common-data-service/webapi/associate-disassociate-entities-using-web-api.md

@@ -294,7 +294,7 @@ OData-Version: 4.0
 
 ### See also
 
-[Web API Basic Operations Sample (C#)](samples/basic-operations-csharp.md)<br />
+[Web API Basic Operations Sample (C#)](samples/cdswebapiservice-basic-operations.md)<br />
 [Web API Basic Operations Sample (Client-side JavaScript)](samples/basic-operations-client-side-javascript.md)<br />
 <xref href="Microsoft.Dynamics.CRM.InitializeFrom?text=InitializeFrom Function" />  
 [Perform operations using the Web API](perform-operations-web-api.md)<br />

powerapps-docs/developer/common-data-service/webapi/create-entity-web-api.md

@@ -242,7 +242,7 @@ OData-Version: 4.0
 
 ### See also
 
-[Web API Conditional Operations Sample (C#)](samples/conditional-operations-csharp.md)<br />
+[Web API Conditional Operations Sample (C#)](samples/cdswebapiservice-conditional-operations.md)<br />
 [Web API Conditional Operations Sample (Client-side JavaScript)](samples/conditional-operations-client-side-javascript.md)<br />
 [Perform operations using the Web API](perform-operations-web-api.md)<br />
 [Compose Http requests and handle errors](compose-http-requests-handle-errors.md)<br />

powerapps-docs/developer/common-data-service/webapi/perform-conditional-operations-using-web-api.md

@@ -873,7 +873,7 @@ More information: [Use column comparison in queries](../column-comparison.md)
 
 ### See also
 
-[Web API Query Data Sample (C#)](samples/query-data-csharp.md)<br />
+[Web API Query Data Sample (C#)](samples/cdswebapiservice-query-data.md)<br />
 [Web API Query Data Sample (Client-side JavaScript)](samples/query-data-client-side-javascript.md)<br />
 [Perform operations using the Web API](perform-operations-web-api.md)<br />
 [Compose Http requests and handle errors](compose-http-requests-handle-errors.md)<br />