Merge branch 'main' into patch-2

Author: KumarVivek

.openpublishing.redirection.json

@@ -6424,16 +6424,6 @@
       "source_path": "powerapps-docs/developer/component-framework/reference/linking/removeLinkedEntity.md",
       "redirect_url": "/powerapps/developer/component-framework/reference/linking",
       "redirect_document_id": "false"
-    },
-    {
-      "source_path": "powerapps-docs/user/cs_email_template_builder.md",
-      "redirect_url": "/powerapps/user/customize-insert-email-template",
-      "redirect_document_id": "false"
-    },
-    {
-      "source_path": "powerapps-docs/user/cs-template-options.md",
-      "redirect_url": "/powerapps/user/email-template-create",
-      "redirect_document_id": "false"
     }
   ]
 }

powerapps-docs/developer/data-platform/calculated-rollup-attributes.md

@@ -71,7 +71,7 @@ search.app:
  Calculated column values are available in the retrieve plug-in pipeline. Post image of a table record update or create contains the calculated column value in stage 40. More information: [Event execution pipeline](event-framework.md#event-execution-pipeline) and [Entity images](understand-the-data-context.md#entity-images)
 
 ### Limitations  
- You can’t use values in calculated columns on a *logical value* in the same table to sort data returned by a query. Although your query can specify that the results should be ordered using a calculated column, the sort direction will be ignored and will not throw an error. If the calculated column references only simple values in the same record, sorting works normally. You can determine the sources used in a calculated column using the `SourceTypeMask` property on the column definitions. More information: [Logical columns](/dynamics365/customer-engagement/developer/introduction-to-entity-attributes.md#BKMK_LogicalAttributes)  
+ You can’t use values in calculated columns on a *logical value* in the same table to sort data returned by a query. Although your query can specify that the results should be ordered using a calculated column, the sort direction will be ignored and will not throw an error. If the calculated column references only simple values in the same record, sorting works normally. You can determine the sources used in a calculated column using the `SourceTypeMask` property on the column definitions. More information: [Logical columns](/dynamics365/customer-engagement/developer/introduction-to-entity-attributes#BKMK_LogicalAttributes)  
 
  Only columns from an immediate parent table can be used in a calculated column.  
 

powerapps-docs/developer/data-platform/cli/reference/solution-command.md

@@ -6,7 +6,7 @@ ms.subservice: dataverse-developer
 author: kkanakas
 ms.author: kartikka
 manager: pemikkel
-ms.date: 04/01/2022
+ms.date: 04/29/2022
 ms.reviewer: jdaly
 ms.topic: reference
 contributors: 
@@ -24,10 +24,10 @@ Commands for working with [Dataverse solution projects](../../../../maker/data-p
 |add-license|Add license and plan info the solution. It has the following parameters: <ul><li>*planDefinitionFile*: License plan definition file in CSV format; expected columns: *Service ID, Display name, More info URL* (alias: -pd)</li><li>*planMappingFile*: License plan mapping file in CSV format; expected values: *Service ID, Component name* (alias: -pm)</li></ul>|
 |add-reference|Sets the reference path to the component project folder by passing the `path` parameter.|`pac solution add-reference --path c:\Users\Downloads\SampleComponent`|
 |check|Perform static analysis check on the solutions against a set of best practices. It has the following parameters: <ul><li> *path*: Path to the solution zip file (alias: -p).</li><li> *outputDirectory*: Output directory where the solution zip file should be stored (alias: -o).</li><li> *geo*: The geographical ___location of the environment where the solution checker should run. It has the following values: *PreviewUnitedStates, UnitedStates,Europe, Asia, Australia, Japan, India, Canada, SouthAmerica, UnitedKingdom, France, Germany, UnitedArabEmirates, Switzerland, USGovernment, USGovernmentL4, USGovernmentL5DoD, China*</li><li> *ruleLevelOverride*: Path to the file containing a JSON array rules and levels to override. It has the following values: *Critical, High, Low, Medium, Informational*|`pac solution check --path c:\Users\Documents\Solution.zip --outputDirectory c:\samplepackage --geo UnitedStates`|
-|clone|Creates a solution project based on the existing solution project. It has the following parameters:<ul><li>*name*: The name of the solution to be exported.</li><li>*targetversion*: The version that the exported solution supports.</li><li>*include*: Settings that should be included in the solution being exported. It has the following values: *autonumbering, calendar, customization, emailtracking, externalapplications, general, isvconfig, marketing, outlooksynchronization, relationshiproles, sales*</li></ul>|`pac solution clone -–name  sampleSolution --version 1.0.0.2 --include general`|
+|clone|Creates a solution project based on the existing solution project. It has the following parameters:<ul><li>*name*: The name of the solution to be exported.</li><li>*include*: Settings that should be included in the solution being exported. It has the following values: *autonumbering, calendar, customization, emailtracking, externalapplications, general, isvconfig, marketing, outlooksynchronization, relationshiproles, sales*</li></ul>|`pac solution clone -–name  sampleSolution --version 1.0.0.2 --include general`|
 |create-settings|Provides the ability to create a settings file that captures the environment variables and connection references in the setting. It has the following parameters: <ul><li>*solution-zip*: Absolute path name or relative path name to the exported solution file (alias: -z).</li><li>*solution-folder*: Folder ___location of the cloned solution on the filesystem, you can either use solution zip file or the solution folder ___location, not both together (alias: -f).</li><li> *settings-file*: Location of the file to be created with the environment variable and connection reference information. The format of the created file is JSON (alias: -s).</li></ul>|`pac solution create-settings --solution-zip C:\SampleSolution.zip --settings-file .\SampleDeploymentSettingsDev.json`|
 |delete| Deletes the solution from the current Dataverse environment. It has the following parameter: <ul><li>*solution-name*: Name of the solution you want to delete (alias: -sn).</li></ul>|`pac solution delete --solution-name Samplesolution`|
-|export|Exports a Dataverse solution from an environment. It requires that you be connected to an environment [Auth command](auth-command.md), and has the following parameters:<ul><li>*path*: Complete file name where the exported solution .zip file will be saved.</li><li>*name*: Name of the solution that needs to be exported.</li><li>*managed*: Defines whether the solution should be exported as a managed solution.</li><li>*targetversion*: The version that the exported solution supports.</li><li>*include*: Settings that should be included in the solution being exported.</li></ul>|`pac solution export --path c:\Users\Documents\Solution.zip --name SampleComponentSolution --managed true --targetversion 10.0.03 --include general`|
+|export|Exports a Dataverse solution from an environment. It requires that you be connected to an environment [Auth command](auth-command.md), and has the following parameters:<ul><li>*path*: Complete file name where the exported solution .zip file will be saved.</li><li>*name*: Name of the solution that needs to be exported.</li><li>*managed*: Defines whether the solution should be exported as a managed solution.</li><li>*include*: Settings that should be included in the solution being exported.</li></ul>|`pac solution export --path c:\Users\Documents\Solution.zip --name SampleComponentSolution --managed true --include general`|
 |import|Imports a Dataverse solution to an environment. It requires that you be connected to an environment [Auth command](auth-command.md), and has the following parameters:<ul><li>*activate-plugins*: Activates plug-ins and workflows in the environment after the import (alias: -ap).</li><li>*async*: Imports the solution asynchronously (alias: -a).</li><li>*force-overwrite*: Forces an overwrite of unmanaged customizations (alias: -f). </li><li>*import-as-holding*: Imports the solution as a holding solution (alias: -h).</li><li>*max-async-wait-time*: Maximum asynchronous wait time in minutes. Default value is 60 minutes (alias: -wt).</li><li>*path*: Path to the solution .zip file. If not specified, assumes the current folder (alias: -p).</li><li>*publish-changes*: Publishes changes after successful import (alias: -pc). </li><li>*skip-dependency-check*: Skips the dependency check against dependencies flagged as product update (alias: -s). </li><li>*convert-to-managed*: This parameter does not take an unmanaged solution and import it as managed.  This parameter will allow a managed solution that is being imported into an environment convert unmanaged components to managed. If this flag is not explicitly set, the solution system will fail the import request because managed layers cannot go on top of unmanaged base components.  This switch will allow the solution import to succeed and the net result is that the inbound managed solution will be the base layer for each of these components – the components in the destination environment are converted from being an unmanaged component to being a managed component. </li></ul>|`pac solution import --path c:\Users\Documents\Solution.zip `|
 |init|Initializes the solution project.  It has the following parameters:<ul><li>*publisher-name*: Publisher name of the organization.</li><li> *publisher-prefix*: Publisher prefix of the organization.</li></ul>|`pac solution init --publisher-name developer --publisher-prefix dev`  |
 |list|Lists all solutions from a Dataverse environment. It requires that you be connected to an environment [Auth command](auth-command.md). This command has no parameters.|`pac solution list`  |

powerapps-docs/developer/data-platform/create-custom-api-solution.md

@@ -2,9 +2,8 @@
 title: "Create a Custom API with solution files (Microsoft Dataverse) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
 description: "You can write create custom APis by editing solution files." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 03/21/2022
+ms.date: 04/29/2022
 ms.reviewer: "jdaly"
-
 ms.topic: "article"
 author: "divka78" # GitHub ID
 ms.subservice: dataverse-developer
@@ -213,6 +212,34 @@ Open the solution you created and verify that the Custom API and the associated
 
 At this point, you can test your API using the steps describe in [Test your Custom API](create-custom-api-maker-portal.md#test-your-custom-api)
 
+## Update a Custom API in a solution
+
+After you ship a solution that contains a Custom API you may want to make some changes to the Custom API in your unmanaged solution. You can add new parameters or response properties and make changes to those columns that support being updated, such as the `displayname` and `description`.
+
+> [!IMPORTANT]
+> You cannot introduce a change to a Custom API in a solution that modifies any of the properties that cannot be changed after they are saved. When you install a newer version of a solution that contains a definition of a Custom API, it will attempt to update the Custom API, Custom API Request Parameters, and Custom API Response properties. A solution update is the same as trying to update the Custom API using any other method.
+>
+> The following are properties in the solution files that cannot be changed after a Custom API is created:
+> - Custom API properties:
+>    - `allowedcustomprocessingsteptype`
+>    - `bindingtype`
+>    - `boundentitylogicalname`
+>    - `isfunction`
+>    - `uniquename`
+>    - `workflowsdkstepenabled`
+> - Custom API RequestParameter properties:
+>    - `isoptional`
+>    - `logicalentityname`
+>    - `type`
+>    - `uniquename`
+> - Custom API Response Property properties:
+>    - `logicalentityname`
+>    - `type`
+>    - `uniquename`
+>
+>  More information: [CustomAPI tables](custom-api-tables.md)
+
+
 
 ## Providing Localized Labels with the solution
 

powerapps-docs/developer/data-platform/dataverse-odata-dataflows-migration.md

@@ -97,15 +97,14 @@ In the **target** environment, create a new dataflow with the OData connector.
     > ![Confirm the column values are correct.](./media/enter-odata-connector-parameters.png "Confirm the column values are correct")
 
 
-    | Column | Description |
-    |--|--|
-    | URL | Provide the Service Root URL in the URL column 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-premises data gateway | None. An on-premises data gateway is not needed for connections to this cloud service. |
-    | Authentication kind | Organizational account. Select **Sign in** to open the sign-in dialog that authenticates the account associated with the connection. |     
-
-    > [!IMPORTANT] 
+    | Column                   | Description                                                                                                                          |
+    |--------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
+    | URL                      | Provide the Service Root URL in the URL column 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-premises data gateway | None. An on-premises data gateway is not needed for connections to this cloud service.                                               |
+    | Authentication kind      | Organizational account. Select **Sign in** to open the sign-in dialog that authenticates the account associated with the connection. |
+   > [!IMPORTANT] 
     > Disable pop-up and cookies blockers in your browser in order to configure the Azure AD authentication. This is similar to the fact that you are using the Dataverse OData endpoint or any other OAuth-based authentication data source. 
     
 1. Select **Next** in the lower right.

powerapps-docs/developer/data-platform/file-attributes.md

@@ -37,7 +37,7 @@ For information about types of files that are not allowed, see [System Settings
 >  - User Delegation SAS Downloads are not supported
 >  - Chunking uploads and downloads are limited to a single chunk
 >  
->  File columns are supported in <xref:Microsoft.Xrm.Sdk.Client.OrganizationServiceProxy.SdkClientVersion> 9.0.45.329 or greater and Web API version 9.1 or greater.
+>  File columns are supported in <xref:Microsoft.Xrm.Sdk.Client.OrganizationServiceProxy.SdkClientVersion> 9.0.45.329 or greater and Web API version 9.1 or greater. File columns are supported in Power Apps portals only in the [notes](../../maker/portals/configure-notes.md) (annotation) table.
 
 
 <!--File data is not passed to plug-ins for performance reasons. You must retrieve the file data in plug-in code using an explicit retrieve call. -->
@@ -295,7 +295,6 @@ Web API (REST) | .NET API (SOAP)
 DELETE /api/data/v9.1/\<entity-type(id)\>/\<attribute-name\> | <xref:Microsoft.Crm.Sdk.Messages.DeleteFileRequest>
 
 ### See Also
-[Image columns](image-attributes.md)
-
+[Image columns](image-attributes.md)  
 
 [!INCLUDE[footer-include](../../includes/footer-banner.md)]