Merge branch 'main' into 2667381

Author: nickdoelman

powerapps-docs/developer/component-framework/code-components-alm.md

@@ -290,7 +290,7 @@ It's recommended that the MAJOR and MINOR version of the code component's versio
 
 A [Dataverse solution has four parts](/powerapps/maker/data-platform/update-solutions#understanding-version-numbers-for-updates) and it can be thought of in the following structure: `MAJOR.MINOR.BUILD.REVISION`.
 
-If you're using **AzureDevOps**, you can set your build pipeline versioning using the `Build` and `Rev` environment variables ([Run (build) number - Azure Pipelines](/azure/devops/pipelines/process/run-number?view=azure-devops&tabs=yaml&preserve-view=true)), and use PowerShell script similar to the approach described in the article [Use PowerShell scripts to customize pipelines](/azure/devops/pipelines/scripts/powershell?view=azure-devops&tabs=yaml#example-powershell-script-version-assemblies&preserve-view=true).
+If you're using **AzureDevOps**, you can set your build pipeline versioning using the `Build` and `Rev` environment variables ([Run (build) number - Azure Pipelines](/azure/devops/pipelines/process/run-number)), and use PowerShell script similar to the approach described in the article [Use PowerShell scripts to customize pipelines](/azure/devops/pipelines/scripts/powershell#example-powershell-script-version-assemblies).
 
 | Semantic version part | ControlManifest.Input.xml version part<br />`MAJOR.MINOR.PATCH` | Solution.xml version part<br />`MAJOR.MINOR.BUILD.REVISION` | AzureDevOps Build Version                                                                        |
 | --------------------- | --------------------------------------------------------------- | ----------------------------------------------------------- | ------------------------------------------------------------------------------------------------ |

powerapps-docs/developer/data-platform/best-practices/business-logic/remove-unsupported-code-using-reflection-workflow-activities.md

@@ -63,7 +63,7 @@ The underlying issue about supporting strong types has been fixed, but this code
 
 ## Additional information
 
-Currently reflection is not allowed. This code references an internal assembly that was included in a white list so that internal code could reflect on it. This is why it does not currently throw an error. But when general restrictions are lifted in the future, this will cause the workflow activity to break.
+Currently reflection is not allowed. This code references an internal assembly that was included in an allow list so that internal code could reflect on it. This is why it does not currently throw an error. But when general restrictions are lifted in the future, this will cause the workflow activity to break.
 
 In order to provide greater capabilities within custom workflow activities without breaking people's business logic, we need everyone to review their code base and remove references like this.
 

powerapps-docs/developer/data-platform/includes/data-service-errors.md

@@ -2097,7 +2097,7 @@
 |0x8004F050<br />-2147159984|Name: **LayerDesiredOrderInvalidXMLDetail**<br />Message: The LayerDesiredOrder parameter contains an invalid XML schema. Check the property [{0}].|
 |0x8004F052<br />-2147159982|Name: **LayerDesiredOrderNotAllowedOnPatch**<br />Message: The LayerDesiredOrder parameter cannot be used when importing a Patch. The parameter can only be used while importing a solution.|
 |0x8004F048<br />-2147159992|Name: **LayerDesiredOrderNotSamePublisher**<br />Message: The solution [{0}] was used in the LayerDesiredOrder parameter, but its publisher [{1}] does not match the publisher of the solution being installed: [{2}]. This parameter can be used only by solutions from the same publisher.|
-|0x8004F065<br />-2147159963|Name: **LayerDesiredOrderNotWhitelist**<br />Message: The LayerDesiredOrder parameter is present in the import request of [{0}], but this solution is not allowed to use it. Solutions must be whitelisted to use this feature.|
+|0x8004F065<br />-2147159963|Name: **LayerDesiredOrderNotWhitelist**<br />Message: The LayerDesiredOrder parameter is present in the import request of [{0}], but this solution is not allowed to use it. Solutions must be allow listed to use this feature.|
 |0x8004F047<br />-2147159993|Name: **LayerDesiredOrderPendingUpgrade**<br />Message: The solution [{0}] used in LayerDesiredOrder parameter has a pending upgrade. Please complete its upgrade before retrying this operation.|
 |0x8004F056<br />-2147159978|Name: **LayerDesiredOrderPublisherNotAllowed**<br />Message: The publisher [{0}] is not allowed to use the LayerDesiredOrder parameter.|
 |0x8004F058<br />-2147159976|Name: **LayerDesiredOrderRestrictedSolution**<br />Message: The LayerDesiredOrder parameter cannot be used on [{0}].|

powerapps-docs/developer/data-platform/optimistic-concurrency.md

@@ -58,8 +58,8 @@ For information about using Organization service to apply optimistic concurrency
 
      When the **IfVersionMatches** behavior is indicated on an update to a table, and where optimistic concurrency isn’t enabled, a fault is returned.  
 
-You can check the [Code](/dotnet/api/system.servicemodel.faultexception.code?view=netframework-4.6.2&preserve-view=true) property of the returned fault to determine if the fault is related to optimistic concurrency. The codes for the error conditions that were shown previously were obtained from the ErrorCodes.cs helper code.  
-  
+  You can check the [Code](/dotnet/api/system.servicemodel.faultexception.code) property of the returned fault to determine if the fault is related to optimistic concurrency. The codes for the error conditions that were shown previously were obtained from the ErrorCodes.cs helper code.  
+ 
 
 
-[!INCLUDE[footer-include](../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/solution-stage-and-import.md

@@ -0,0 +1,57 @@
+---
+title: "Sample: Solution staging with asynchronous import (Microsoft Dataverse) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "Demonstrates how to stage and asynchronously import a solution." # 115-145 characters including spaces. This abstract displays in the search result.
+ms.custom: ""
+ms.date: 04/05/2022
+ms.reviewer: 
+ms.topic: sample
+author: "phecke" # GitHub ID
+ms.author: "pehecke" # MSFT alias of Microsoft employees only
+manager: "kvivek" # MSFT alias of manager or PM counterpart
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Sample: Solution staging with asynchronous import
+
+<!-- https://docs.microsoft.com/dynamics365/customer-engagement/developer/sample-work-solutions -->
+
+This sample shows how to perform the following actions with solutions:
+
+- Stage a solution and check the validation results
+- Import the staged solution using an asynchronous job and check for job completion
+
+You can download the sample from [here](https://github.com/microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/SolutionStagingAndImport).
+
+## How to run this sample
+
+[!include[cc-how-to-run-samples](../../includes/cc-how-to-run-samples.md)]
+
+Be sure to edit the App.config file and set the Username, Password, and Url values for your test environment.
+
+## What this sample does
+
+This sample shows how to stage (load) a solution in a Microsoft Dataverse environment and check the solution validation results. This enables you to check for a valid solution staging prior to solution import. Next, the sample performs an asynchronous import of the staged solution. An asynchronous job allows for importing large solutions and avoiding a timeout error.
+
+## How this sample works
+
+In order to simulate the scenario described in [What this sample does](#what-this-sample-does), the sample will do the following:
+
+### Setup
+
+1. Invokes the SampleHelpers.Connect method to authenticate the user and return a web service reference.
+
+### Demonstrate
+
+1. The `StageSolution` method reads the compressed solution file and stages the solution.
+1. The `ImportSolution` method imports the solution using an asynchronous job.
+1. The `CheckImportStatus` method waits for the asynchronous job to complete and checks the job for a successful status.
+
+### Clean up
+
+The program does not automatically delete the imported solution. You should manually delete the solution named "Contoso sample" from your test environment.
+
+[!INCLUDE[footer-include](../../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/toc.yml

@@ -268,6 +268,8 @@
   items:
   - name: Work with solutions
     href: work-solutions.md 
+  - name: Staging and async import
+    href: solution-stage-and-import.md 
   - name: Detect solution dependencies
     href: detect-solution-dependencies.md
 - name: Time zones

powerapps-docs/developer/data-platform/powerapps-cli.md

@@ -85,6 +85,28 @@ Launch Visual Studio Code and select the **Extensions** icon, click on the ellip
    > [!div class="mx-imgBorder"]
    > ![Initiate install with the downloaded file.](media/side-load-install-3.png "Install from VSIX")
 
+### Standalone Power Platform CLI
+
+To install standalone Power Platform CLI:
+
+<!--1. Install [Npm](https://www.npmjs.com/get-npm) (comes with Node.js) or [Node.js](https://nodejs.org/en/) (comes with npm). We recommend LTS (Long Term Support) version 10.15.3 LTS because it seems to be the most stable.
+
+1. Install [.NET Framework 4.6.2 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net462). 
+
+1. If you don’t already have Visual Studio 2017 or later, follow one of these options:
+   - Option 1: Install [Visual Studio 2017](/visualstudio/install/install-visual-studio?view=vs-2017) or later.
+   - Option 2: Install [.NET Core 2.2 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) and then install [Visual Studio Code](https://code.visualstudio.com/Download)-->
+1. Download and install [Microsoft Power Platform CLI](https://aka.ms/PowerAppsCLI).
+
+1. To take advantage of all the latest capabilities, update Microsoft Power Platform CLI tooling to the latest version by using this command (not applicable for Power Platform VS Code Extension):
+    ```CLI
+    pac install latest
+
+    ```
+> [!NOTE]
+> - Currently, Microsoft Power Platform CLI is supported only on Windows 10 and Windows 11.
+> - Power Platform Tools for Visual Studio Code, and works on Windows 10, Windows 11, Linux, and MacOS.
+
 ## Successful installation
 
 Once the installation is successful, you will need to restart Visual Studio Code, upon which you will see the following notification.
@@ -125,8 +147,7 @@ This table lists some of the common commands used in the CLI.
 
 ## Uninstall Microsoft Power Platform CLI 
 
-To uninstall Microsoft Power Platform CLI tooling, run the MSI installer from [here](/powerapps/developer/data-platform/powerapps-cli).
-
+To uninstall Microsoft Power Platform CLI tooling, run the MSI from [here](/powerapps/developer/data-platform/powerapps-cli).
 
 To uninstall the Visual Studio Code extension, follow the same steps as installing the extension, except this time select the **Uninstall** button.
 
@@ -148,3 +169,5 @@ If you're a Private Preview participant and have an older version of CLI, follow
 
 [Power Apps component framework](../component-framework/overview.md)
 
+
+[!INCLUDE[footer-include](../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/reference/entities/datalakeworkspace.md

@@ -306,7 +306,7 @@ These columns/attributes return true for either **IsValidForCreate** or **IsVali
 
 |Property|Value|
 |--------|-----|
-|Description|Application Id that is white listed in AAD Tenant ID to access the Graph API.|
+|Description|Application Id that is allow listed in AAD Tenant ID to access the Graph API.|
 |DisplayName|Whitelisted App Id|
 |IsValidForForm|True|
 |IsValidForRead|True|

powerapps-docs/developer/data-platform/reference/entities/datalakeworkspacepermission.md

@@ -306,7 +306,7 @@ These columns/attributes return true for either **IsValidForCreate** or **IsVali
 
 |Property|Value|
 |--------|-----|
-|Description|Application Id that is white listed in AAD tenant id to access the Graph API.|
+|Description|Application Id that is allow listed in AAD tenant id to access the Graph API.|
 |DisplayName|Whitelisted App ID|
 |IsValidForForm|True|
 |IsValidForRead|True|

powerapps-docs/developer/data-platform/understand-terminology.md

@@ -31,19 +31,18 @@ The data structures that developers work with are exposed as entities, and the t
 
 |To...|Using...|Developers will...|
 |--|--|--|
-|Create a Dataverse table|[Web API](/powerapps/developer/data-platform/webapi/overview)|POST an instance of the [EntityMetadata EntityType](/dynamics365/customer-engagement/web-api/entitymetadata?view=dynamics-ce-odata-9&preserve-view=true) to the `/EntityDefinitions` resource|
-|Create a Dataverse table|[.NET SDK](/powerapps/developer/data-platform/org-service/overview)|Create an instance of the [EntityMetadata Class](/dotnet/api/microsoft.xrm.sdk.metadata.entitymetadata?view=dynamics-general-ce-9&preserve-view=true) and use the [CreateEntityRequest Class](/dotnet/api/microsoft.xrm.sdk.messages.createentityrequest?view=dynamics-general-ce-9&preserve-view=true) to send this to the Organization service|
-|Create a row or record in a Dataverse table|[Web API](/powerapps/developer/data-platform/webapi/overview)|POST data defined as an a specific EntityType. You can find a list of these EntityTypes here: [Web API EntityType Reference](/dynamics365/customer-engagement/web-api/entitytypes?view=dynamics-ce-odata-9&preserve-view=true)|
-|Create a row or record in a Dataverse table|[.NET SDK](/powerapps/developer/data-platform/org-service/overview)|Create an instance of the [Entity Class](/dotnet/api/microsoft.xrm.sdk.entity?view=dynamics-general-ce-9&preserve-view=true) or a class that inherits from it (Account, Contact, etc.) and use the [CreateRequest Class](/dotnet/api/microsoft.xrm.sdk.messages.createrequest?view=dynamics-general-ce-9&preserve-view=true) to send this to the Organization service. A developer can find the information they need to use the Entity class in the [entity reference](/powerapps/developer/data-platform/reference/about-entity-reference).|
-
+|Create a Dataverse table|[Web API](/powerapps/developer/data-platform/webapi/overview)|POST an instance of the [EntityMetadata EntityType](/dynamics365/customer-engagement/web-api/entitymetadata) to the `/EntityDefinitions` resource|
+|Create a Dataverse table|[.NET SDK](/powerapps/developer/data-platform/org-service/overview)|Create an instance of the [EntityMetadata Class](/dotnet/api/microsoft.xrm.sdk.metadata.entitymetadata) and use the [CreateEntityRequest Class](/dotnet/api/microsoft.xrm.sdk.messages.createentityrequest) to send this to the Organization service|
+|Create a row or record in a Dataverse table|[Web API](/powerapps/developer/data-platform/webapi/overview)|POST data defined as an a specific EntityType. You can find a list of these EntityTypes here: [Web API EntityType Reference](/dynamics365/customer-engagement/web-api/entitytypes)|
+|Create a row or record in a Dataverse table|[.NET SDK](/powerapps/developer/data-platform/org-service/overview)|Create an instance of the [Entity Class](/dotnet/api/microsoft.xrm.sdk.entity) or a class that inherits from it (Account, Contact, etc.) and use the [CreateRequest Class](/dotnet/api/microsoft.xrm.sdk.messages.createrequest) to send this to the Organization service. A developer can find the information they need to use the Entity class in the [entity reference](/powerapps/developer/data-platform/reference/about-entity-reference).|
 
 ## Terminology use depending on protocol or technology
 
 The terminology used in the developer documentation depends on the protocol or class library used by developers. 
 
 - When working with the [Web API](/powerapps/developer/data-platform/webapi/overview), we use the terminology defined by the OData protocol. Data structures are defined as *EntityTypes*, which have properties and navigation properties. 
 
-- When working with the [.NET SDK](/powerapps/developer/data-platform/org-service/overview), we use *Entity* because there is an Entity class. The Entity class has an [Attributes](/dotnet/api/microsoft.xrm.sdk.entity.attributes?view=dynamics-general-ce-9&preserve-view=true) property that contains a collection of attributes that are defined by data in an  [AttributeMetadata Class](/dotnet/api/microsoft.xrm.sdk.metadata.attributemetadata?view=dynamics-general-ce-9&preserve-view=true) and many other classes derived from it. 
+- When working with the [.NET SDK](/powerapps/developer/data-platform/org-service/overview), we use *Entity* because there is an Entity class. The Entity class has an [Attributes](/dotnet/api/microsoft.xrm.sdk.entity.attributes) property that contains a collection of attributes that are defined by data in an  [AttributeMetadata Class](/dotnet/api/microsoft.xrm.sdk.metadata.attributemetadata) and many other classes derived from it. 
 
 We use the appropriate terminology to describe the SDK and Web API technology. The developer documentation will *at times* use different terminology than the Power Apps user interface. The table below will help guide you to some of the terminology differences between the developer documentation and rest of the Power Apps documentation. 
 
@@ -53,4 +52,4 @@ We use the appropriate terminology to describe the SDK and Web API technology. T
 | Column         | Attribute           | Property           |
 | Row            | Record              | Record             |
 | Choices        | OptionSet/Picklist  | OptionSet          |
-| Yes/No         | Boolean             | Boolean            |
+| Yes/No         | Boolean             | Boolean            |