Merge branch 'master' into portals-oldtonewlicense-1730544

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/TOC.yml

@@ -137,6 +137,8 @@
       href: data-import-entities.md
   - name: Data Export Service
     href: data-export-service.md
+  - name: Migrate data between environments using OData dataflows
+    href: cds-odata-dataflows-migration.md
   - name: Synchronize data
     href: data-synchronization.md
     items:

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/cds-odata-dataflows-migration.md

@@ -0,0 +1,195 @@
+---
+title: Migrate data between Common Data Service environments using the dataflows OData connector
+author: denisem-msft
+ms.reviewer: "nabuthuk"
+description: Migrate data between Common data Service environments using dataflows OData connector.
+ms.date: 05/05/2020
+ms.service: powerapps
+ms.topic: "article"
+ms.author: demora
+search.app: 
+  - PowerApps
+---
+
+# Migrate data between Common Data Service environments using the dataflows OData connector
+
+Common Data Service [Web API](/powerapps/developer/common-data-service/webapi/overview) works with any technology that supports OData and OAuth. There are many options available to move data in and out of Common Data Service. OData connector is one of the dataflows, which is designed to support migration and synchronization of large datasets in Common Data Service. 
+
+In this article, we walk you through how to migrate data between Common Data Service environments using the dataflows OData connector. 
+
+## Prerequisites
+
+- System Administrator or System Customizer security role permission on both source and the target environments.
+
+- Power Apps, Power Automate, or Common Data Service license (per app or per user).
+
+- Two Common Data Service [environments with database](/power-platform/admin/create-environment#create-an-environment-with-a-database).
+
+## Scenarios
+
+ - A one-time cross-environment or cross-tenant migration is needed (for example, geo-migration)
+
+ - Developer needs to update an app that is being used in production. Test data is needed in their development environment to easily build out changes. 
+
+## Step 1: Plan out the dataflow
+
+1. Identify the source and target environments.
+
+    - The **source environment** is where the data is migrated from. 
+
+    - The **target environment** is where the data is migrated to. 
+
+1. Ensure that the entities are already defined in the target environment. Ideally both environments should have the same entities defined with the same solution.
+
+1. When importing relationships, multiple dataflows are required.
+
+    One (parent/independent) to many (children/dependent) entities require separate dataflows. Configure the parent dataflow to run before any child entities, since the data in the parent needs to be loaded first to correctly map to the fields in the corresponding child entities.
+
+## Step 2: Get the OData endpoint 
+
+Common Data Service provides an OData endpoint that does not require any additional configuration to authenticate with the dataflows connector. It is relatively easy process to connect to the source environment. 
+
+This article will walk through how to set up a new dataflow with the OData connector. See, [Creating dataflows](https://docs.microsoft.com/powerapps/maker/common-data-service/create-and-use-dataflows) article for connecting to all data sources supported by dataflows.
+
+From the **source** environment, get the [OData endpoint](https://docs.microsoft.com/powerapps/developer/common-data-service/view-download-developer-resources) (aka Service Root URL) for that environment:
+
+1. Sign into [Power Apps](https://make.powerapps.com).
+
+1. Select the required source environment from the top-right corner.
+
+1. Select the Settings (gear) icon in the top-right corner, and select **Advanced Settings**.
+
+1. On the **Settings** page, select the drop-down arrow next to ****Settings**, and select **Customizations**.
+
+1. On the **Customizations** page, select **Developer Resources**.
+
+1. Copy the **Service Root URL** to notepad.
+
+    > [!div class="mx-imgBorder"]
+    > ![Copy the service root URL in the developer resources](./media/get-odata-endpoint-url.png)
+ 
+## Step 3: Create a new OData dataflow
+
+In the **target** environment, create a new dataflow with the OData connector.
+
+1. Sign into [Power Apps](https://make.powerapps.com).
+
+1. Select the required target environment from the top-right corner.
+
+1. In the left navigation pane, expand the **Data** menu, and select **Dataflows**.
+
+1. Select **New dataflow** to create a new dataflow. Provide a meaningful name for the dataflow. Select **Create**.
+   > [!div class="mx-imgBorder"]
+   > ![Prompt for a new dataflow](./media/enter-name-for-new-dataflow.png)
+
+1. Select the **OData** connector.
+
+    > [!div class="mx-imgBorder"]
+    > ![Select OData source](media/select-odata-data-source.png)
+
+1. In the Connection Settings dialog box, type the field values:
+
+    > [!div class="mx-imgBorder"]
+    > ![Confirm the field values are correct](./media/enter-odata-connector-parameters.png)
+
+
+    | Field | Description |
+    |--|--|
+    | URL | Provide the Service Root URL in the URL field of the connection settings |
+    | Connection | Create new connection. This will be automatically chosen if you have not made an OData connection in dataflows before. |
+    | Connection name | Optionally, rename the connection name, but a value is automatically populated |  |
+    | On-premise data gateway | None. An on-premises data gateway is not needed for connections to this cloud service. |
+    | Authentication kind | Organizational account. Select the Sign in button to open the login dialog that authenticates the account associated with the connection. |    
+
+    > [!IMPORTANT] 
+    > Disable pop-up and cookies blocker in your browser in order to configure the Azure AD authentication. This is orthogonal to the fact that you are using the Common Data Service OData endpoint or any other OAuth based authentication data source. 
+    
+1. Select **Next** in the bottom right.
+
+## Step 4: Select and transform data with the Power Query 
+
+Use Power Query to select the tables and also transform data as per your requirement.
+
+First, select the entities that need to be transferred. You can browse all entities in the source environment and preview some of the data in each entity.
+
+> [!div class="mx-imgBorder"]
+> ![Power query navigator](./media/edit-queries-for-selected-entities.png)
+
+1. Select one or multiple entities as needed, then select **Transform data**.
+
+    > [!NOTE]
+    > When importing relationships, remember that the parent entity dataflow need to be imported before the child ones. The data for the child dataflow will require data to be in the parent entity for it to correctly map, otherwise it might throw an error.
+ 
+1. In the **Power Query - Edit queries** window, you can transform the query before import.
+
+    - If you are only migrating data, there should not be a need to modify anything here. 
+
+    - Reducing the number of unnecessary columns will improve the dataflow performance for larger data sets.
+
+    > [!TIP]
+    > You can go back to choose more tables in the **Get data** ribbon option for the same OData connector.
+
+1. Select **Next** in the bottom right.
+
+## Step 5: Configure target environment settings
+
+This section describes how to define the target environment settings.
+
+### Step 5.1: Map entities 
+
+For each entity chosen, select the behavior for importing that entity in these settings and select **Next**.
+
+> [!div class="mx-imgBorder"]
+> ![Map entities](./media/map-entities-to-target.png)
+
+- **Load to existing Entity (recommended)**
+
+    - The dataflow syncs data from the source environment's entity to the target environment, and the same entity schema is already defined in the target environment.
+
+    - Ideally, use the same solution in both target and source environments to make data transfer seamless. Another advantage to having a pre-defined entity is more control over which solution the entity is defined in and the prefix.
+    
+    - Choose the **Delete rows that no longer exist in the query output**. This ensures that the relationships will map correctly because it maintains the values for the lookups.
+    
+    - If the schema is identical in both source and target tables, you can select the **Auto map** button to quickly map the fields.
+    
+    - Requires a key configuration in the target environment (as the unique identifier fields is not available to modify).
+
+- **Load to new entity (not recommended)**
+
+    - Ideally there should be an entity pre-defined in the target environment from the same solution import as the source environment. However, there are cases where this might not be feasible, so there is this option to choose if there is no existing entity to load to. 
+
+    - It creates a new custom entity in the target environment's default solution.
+
+- There is an option to **Do not load**, but do not include entities in the dataflow that are not being loaded. You can select **Back** from this menu to return to the Power Query menu and remove the entities that are not needed.
+
+### Step 5.2: Refresh settings
+
+Select **Refresh manually** since this is a one-time migration ad select **Create**. 
+
+## Step 6: Run the dataflow
+
+The initial dataflow load initiates when you select the **Create** button. 
+
+> [!div class="mx-imgBorder"]
+> ![Refresh manually](./media/initiate-dataflow-process.png)
+
+You can manually initiate a dataflow by selecting **(...)** in the dataflows list. Make sure to run dependent dataflows after the parent flows have completed.
+
+> [!div class="mx-imgBorder"]
+> ![Refresh manually](./media/refresh-dataflow-manually.png) 
+
+## Tips
+
+- Try out one entity first to walk through the steps, then build out all the dataflows.
+
+- If there are more entities that contain larger amounts of data, consider configuring multiple separate dataflows for individual entities.
+
+- One to many relationships will require separate dataflows for each entity. Configure and run the parent (aka one, or independently) entity dataflow before the child (aka many, or dependent) entity.
+
+- If there are errors with the dataflow refresh, you can view the refresh history in the **(...)** menu in the dataflows list and download each refresh log.
+
+## Limitations
+
+- Many to many relationship data imports are not supported.
+
+- Parent dataflows must be manually configured to run before child dataflows.

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: 04/30/2020
+ms.date: 05/05/2020
 ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
@@ -23,13 +23,12 @@ search.app:
 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.
-> - This preview feature is not available in all regions.
+> - This is a preview feature, and isn't available in all regions.
 > - [!INCLUDE[cc_preview_features_definition](../../includes/cc-preview-features-definition.md)]
 
 ## Applications support
 
-You can use the **Analyze in Power BI** option (**Data** > **Entities** > **Analyze in Power BI**) in Power Apps (https://make.powerapps.com) to use the SQL connection feature to analyze data in Power BI Desktop.
+You can use the **Analyze in Power BI** option (**Data** > **Entities** > **Analyze in Power BI**) in Power Apps (https://make.powerapps.com) to use the SQL connection feature to analyze data in Power BI Desktop. More information: [View entity data in Power BI Desktop](/powerapps/maker/common-data-service/view-entity-data-power-bi)
 
 > [!NOTE]
 > If you don't have the **Analyze in Power BI** option in your Power Apps environment, you don't yet have access to the SQL connection feature.

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