Merge branch 'live' into live

Author: yasirsafeer

powerapps-docs/developer/common-data-service/best-practices/business-logic/optimize-assembly-development.md

@@ -4,8 +4,8 @@ description: "Consider merging separate plug-ins/custom workflow activities into
 services: ''
 suite: powerapps
 documentationcenter: na
-author: jowells
-manager: austinj
+author: JimDaly
+manager: sunilg
 editor: ''
 tags: ''
 ms.service: powerapps
@@ -14,7 +14,7 @@ ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: na
 ms.date: 1/15/2019
-ms.author: jowells
+ms.author: phecke
 search.audienceType: 
   - developer
 search.app: 
@@ -33,26 +33,30 @@ search.app:
 
 When developing custom assemblies, there are a couple of considerations to take in:
 
+1. Assemblies with a large number of custom workflow activities can take a long time to upload when being registered.
 1. Multiple different custom assemblies
     - Increased maintainability complexity
     - Potential increase plug-in execution length
+1. Sandbox assembly size constraint is 16 MB in Common Data Service.
 
-2. Sandbox assembly size constraint is 16 MB in Common Data Service.
 
 <a name='guidance'></a>
 
 ## Guidance
 
-> [!NOTE]
-> Further Guidance clarification is under development regarding specific details in optimizing assembly development, such as, how to merge separate plug-ins into a single custom assembly and suggestions to minimize the assembly size.
+### Limit the number of Custom Workflow Activities in a Single assembly
+
+When an assembly that contains custom workflow activities is uploaded during plug-in registration, additional checks are required for custom workflow activities.
+
+While an assembly with hundreds of ordinary plug-in types may be uploaded very quickly, an assembly with more than 100 custom workflow activities may take several minutes or even time out when being registered or updated. We recommend including no more than 50 custom workflow activities in a single assembly.
 
 ### Consolidate Plug-ins or Custom Workflow Activities into a Single Assembly
 
 Plug-ins and custom workflow activities developed for a Common Data Service solution should exist with others in a single Visual Studio project. Consider merging separate plug-ins/custom workflow activities into a single Visual Studio project/assembly unless the plug-ins fall into the following exceptions:
 
 1. A plug-in/custom workflow activity needs to be selectively deployed to one environment but not to others.
-
-2. The physical assembly size is near or greater than 16 MB for a Common Data Service instance.
+1. The physical assembly size is near or greater than 16 MB for a Common Data Service instance.
+1. There will be more than 50 custom workflow activities in the assembly, as mentioned in [Limit the number of Custom Workflow Activities in a Single assembly](#limit-the-number-of-custom-workflow-activities-in-a-single-assembly)
 
 
 ### Move Plug-ins/Custom Workflow Activities into Multiple Assemblies
@@ -63,7 +67,12 @@ Power Apps and Dynamics 365 (online) has an assembly size constraint of 16 MB wh
 
 ## Problematic patterns
 
+### Assemblies take a long time to upload when being registered
+
+When a custom workflow activity type plug-in is uploaded while being registered, each type requires additional validation checking. When an assembly contains more than a hundred custom workflow activity type plug-ins, it could require several minutes to complete the checks and is at risk of timing out.
+
 ### Multiple assemblies
+
 Having multiple assemblies has a couple of areas that can be impacted:
 
 1. Performance - each assembly has a lifecycle that is managed by Common Data Service.  This includes loading, caching, and unloading the assemblies.  Having more than one assembly causes more work to be done on the server, loading and caching an assembly, and could affect the overall plug-in/custom workflow activity execution length.

powerapps-docs/developer/common-data-service/best-practices/work-with-data/index.md

@@ -1,3 +1,39 @@
+<<<<<<< HEAD
+---
+title: "Developers: Best practices and guidance around working with data for the Common Data Service | Microsoft Docs"
+description: Best practices and guidance around working with data for developers of the Common Data Service in Power Apps.
+services: ''
+suite: powerapps
+documentationcenter: na
+author: jowells
+manager: austinj
+editor: ''
+tags: ''
+ms.service: powerapps
+ms.devlang: na
+ms.topic: article
+ms.tgt_pltfrm: na
+ms.workload: na
+ms.date: 12/12/2018
+ms.author: jowells
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+
+# Best practices and guidance around working with data for the Common Data Service
+
+This list below contains all of the best practices and guidance around integrating data using code with the Common Data Service.
+
+|Best Practice  |Description  |
+|---------|---------|
+|[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
+
+### See Also
+[Work with data using code in Common Data Service (PowerApps)](../../work-with-data-cds.md)<br />
+=======
 ---
 title: "Developers: Best practices and guidance around working with data for the Common Data Service | Microsoft Docs"
 description: Best practices and guidance around working with data for developers of the Common Data Service in Power Apps.
@@ -31,4 +67,5 @@ This list below contains all of the best practices and guidance around integrati
 |[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
 
 ### See Also
-[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
+[Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
+>>>>>>> ae864535ae5aab1966c3c5bd8c4250316a788d91