Merge branch 'master' into portals-powerbi

Author: tapanm-MSFT

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/maker/common-data-service/how-managed-solutions-merged.md",
+      "redirect_url": "https://docs.microsoft.com/power-platform/alm/how-managed-solutions-merged",
+      "redirect_document_id": "false"
+    },    
+    {
+      "source_path": "powerapps-docs/maker/common-data-service/use-solutions-for-your-customizations.md",
+      "redirect_url": "https://docs.microsoft.com/power-platform/alm/use-solutions-for-your-customizations",
+      "redirect_document_id": "false"
+    },    
     {
       "source_path": "powerapps-docs/user/run-app-client.md",
       "redirect_url": "run-canvas-and-model-apps-on-mobile",

powerapps-docs/developer/common-data-service/build-tools-overview.md

@@ -28,6 +28,7 @@ Use Power Apps build tools to automate common build and deployment tasks related
 > - Power Apps build tools is a preview feature.
 > - [!INCLUDE [cc-preview-features-definition](../../includes/cc-preview-features-definition.md)]
 
+For more information about using the build tools with application lifecycle management see [Power Apps build tools for Azure DevOps](/power-platform/alm/devops-build-tools).
 
 ## What are Power Apps build tools?
 

powerapps-docs/developer/common-data-service/build-tools-tasks.md

@@ -32,7 +32,7 @@ The Power Apps checker task runs a static analysis check on your solution(s) aga
 
 | **Parameters** | **Description** |
 | --- | --- |
-| Power Apps checker service  |   Select the service endpoint for Power Apps checker. The service   endpoint is defined under **Service Connections** in **Project Settings**.  **NOTE:** The service connection type that must be used for this specific task only is ‘Power Apps Checker,’ which is a service principals connection. More information on how to configure Service Principals before you can use the  task is available [here](https://aka.ms/buildtoolsconnection).  |
+| Power Apps checker service  |   Select the service endpoint for Power Apps checker. The service   endpoint is defined under **Service Connections** in **Project Settings**.  **NOTE:** The service connection type that must be used for this specific task only is ‘Power Apps Checker,’ which is a service principals connection. More information on how to configure Service Principals before you can use the  task is available [here](build-tools-tasks#configure-service-connection-for-power-apps-checker).  |
 | Location of file to analyze  | Specify whether to reference a local file or a reference file from a Sas url. 
 | Local files to analyze/Sas uri for file to analyze |  Specify the path and file name of the zip files to analyze.   Wildcards can be used. For example, **\*.zip   for all zip files in all sub folders. You can choose to specify the files   directly or reference a File from a Sas uri.   |
 |  Rule set |   Specify which ruleset to apply. The following two rulesets are available:  **Solution Checker:** This is the same ruleset that is run from the [Maker Portal](https://make.powerapps.com/).    **AppSource:** This is the extended ruleset that is used to certify an application before it can be published to [AppSource](https://appsource.microsoft.com/).   |

powerapps-docs/developer/common-data-service/checker/webapi/overview.md

@@ -25,6 +25,8 @@ search.app:
 
 The Power Apps checker web API provides a mechanism to run static analysis checks against customizations and extensions to the Common Data Service platform. It is available for makers and developers to perform rich static analysis checks on their solutions against a set of best practice rules to quickly identify problematic patterns. The service provides the logic for the [solution checker feature](../../../../maker/common-data-service/use-powerapps-checker.md) in the Power Apps maker [portal](https://make.powerapps.com) and is included as part of the automation for [applications submitted to AppSource](../../publish-app-appsource.md). Interacting with the service directly in this manner allows for analysis of solutions that are included as part of on-premise (all supported versions) and online environments.
 
+For information about using the checker service from PowerShell code see [Work with solutions using PowerShell](/power-platform/alm/powershell-api).
+
 <a name="bkmk_altApproaches"></a>
 
 ## Alternative approaches

powerapps-docs/developer/common-data-service/introduction-solutions.md

@@ -13,7 +13,7 @@ ms.devlang: na
 ms.topic: article
 ms.reviewer: "pehecke"
 ms.workload: na
-ms.date: 01/28/2019
+ms.date: 05/06/2020
 ms.author: jdaly
 search.audienceType: 
   - developer
@@ -31,7 +31,7 @@ Every customization that you make to Common Data Service, or to a previously ins
 If you intend to transport customizations or extensions between different Common Data Service environments or distribute solutions using AppSource, you must understand the solution framework.
 
 > [!NOTE]
-> For detailed information about how to effectively use solutions for a successful application lifecycle management (ALM) implementation, see [Whitepaper: Solution Lifecycle Management](https://www.microsoft.com/download/details.aspx?id=57777)
+> For detailed information about how to effectively use solutions for a successful application lifecycle management (ALM) implementation, see [Application lifecycle management (ALM) with Microsoft Power Platform](/power-platform/alm).
 
 ## Managed and unmanaged solutions
 

powerapps-docs/developer/common-data-service/org-service/metadata-option-sets.md

@@ -25,7 +25,7 @@ new `OptionMetadata` instance. When you define an option, it will contain an opt
 context of the publisher set for the solution that the option set is created in. 
 This prefix helps reduce the chance of creating duplicate option sets for a managed solution, 
 and in any option sets that are defined in organizations where your managed solution is installed. For more information, 
-see [Merge option set options](../../../maker/common-data-service/how-managed-solutions-merged.md).  
+see  [Merge option set options](/power-platform/alm/how-managed-solutions-merged).  
 
 You can download the sample from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/WorkWithOptionSets).
 

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

@@ -203,7 +203,7 @@ In this scenario any Common Data Service tenant can potentially use your multi-t
 
   For information about creating a Common Data Service solution, see the following topics:
 
-- [Use solutions for your customizations](../../maker/common-data-service/use-solutions-for-your-customizations.md)  
+- [Use solutions for your customizations](/power-platform/alm/use-solutions-for-your-customizations)  
 - [Package and distribute extensions using solutions](/dynamics365/customer-engagement/developer/package-distribute-extensions-use-solutions)  
 
   However, the application user cannot be included with a solution so you will need to provide a way to create this application user and associate it with the custom security role.  

powerapps-docs/developer/common-data-service/webapi/create-update-optionsets.md

@@ -31,7 +31,7 @@ new `OptionMetadata` instance. When you define an option, it will contain an opt
 context of the publisher set for the solution that the option set is created in. 
 This prefix helps reduce the chance of creating duplicate option sets for a managed solution, 
 and in any option sets that are defined in organizations where your managed solution is installed. For more information, 
-see [Merge option set options](../../../maker/common-data-service/how-managed-solutions-merged.md#merge-option-set-options).
+see [Merge option set options](/power-platform/alm/how-managed-solutions-merged#merge-option-set-options).
 
  ## Messages  
  The following table lists the messages that you can use with global option sets.  

powerapps-docs/developer/component-framework/manifest-schema-reference/property.md

@@ -1,6 +1,6 @@
 ---
 title: Property Element | Microsoft Docs
-description: 
+description:
 keywords:
 ms.author: nabuthuk
 author: Nkrb
@@ -27,10 +27,10 @@ Model-driven apps and canvas apps (public preview)
 |------|------|------|-------|
 |name |Name of the property |string |Yes |
 |display-name-key |Used in the customization screens as localized strings that describes the name of the property. |string |Yes |
-|of-type|Defines the data type of the property|See [Remarks](#remarks)|Optional|
+|of-type| Defines the data type of the property| See [Remarks](#remarks)|Optional|
 |usage |The usage attribute identifies if the property is meant to represent an entity attribute that the component can change (bound) or read-only values (input)|bound or input |Optional |
 |required |Whether the property is required or not |boolean |Optional |
-|of-type-group |Name of the type-group as defined in manifest|string |Optional |
+|of-type-group |Name of the type-group as defined in manifest| string |Optional |
 |description-key |Used in the customization screens as localized strings that describes the description of the property. |string |Optional |
 |default-value |The default configuration value provided to the component. In model-driven apps, this attribute is only allowed on inputs since the bound parameters expect to have a field associated. |string |Optional |
 
@@ -50,7 +50,7 @@ The `of-type` attribute value must be one of the following:
 ## Example
 
 ```xml
-<property name="myFirstProperty" display-name-key="myFirstProperty_Display_Key" 
+<property name="myFirstProperty" display-name-key="myFirstProperty_Display_Key"
 description-key="myFirstProperty_Desc_Key" of-type="SingleLine.Text" usage="bound" required="true" />
 ```
 

powerapps-docs/developer/component-framework/reference/property.md

@@ -1,6 +1,6 @@
 ---
 title: Property | Microsoft Docs
-description: 
+description:
 keywords:
 ms.author: nabuthuk
 author: Nkrb
@@ -16,9 +16,9 @@ ms.assetid: a118f54f-be47-4f35-9ffb-7afa6c296631
 # Property
 
 Interface for `context.parameters.<property_key>`
-## Available for 
+## Available for
 
-Model-driven apps
+Model-driven apps and canvas apps (public preview)
 
 ## Properties
 
@@ -49,4 +49,4 @@ Model-driven apps
 ### Related topics
 
 [Power Apps component framework API reference](../reference/index.md)<br/>
-[Power Apps component framework overview](../overview.md)
+[Power Apps component framework overview](../overview.md)