Merge branch 'master' into portals-task1630039ICM-CDN

Author: tapanm-MSFT

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "powerapps-docs/maker/canvas-apps/add-images-to-excel.md",
+      "redirect_url": "add-images-pictures-audio-video",
+      "redirect_document_id": "false"
+    },    
+    {
+      "source_path": "powerapps-docs/maker/canvas-apps/tutorial-working-with-images-in-excel.md",
+      "redirect_url": "add-images-pictures-audio-video",
+      "redirect_document_id": "false"
+    },    
     {
       "source_path": "powerapps-docs/developer/common-data-service/fill-app-submission-form-appsource.md",
       "redirect_url": "register-microsoft-partner-network",

powerapps-docs/developer/common-data-service/best-practices/TOC.yml

@@ -28,6 +28,8 @@
         href: business-logic/set-timeout-for-external-calls-from-plug-ins.md
       - name: Use InvalidPluginExecutionException in plug-ins and workflow activities
         href: business-logic/use-invalidpluginexecutionexception-plugin-workflow-activities.md
+      - name: Verify certification dependencies for plug-ins making outbound calls
+        href: business-logic/verify-certification-dependencies.md
   - name: Work with data using code
     href: work-with-data/index.md
     items:

powerapps-docs/developer/common-data-service/best-practices/business-logic/index.md

@@ -27,7 +27,7 @@ This list below contains all of the guidance and best practices regarding the pl
 
 |Best Practice  |Description  |
 |---------|---------|
-|[Avoid usage of batch request types in plug-ins and workflow activities](avoid-batch-requests-plugin.md)     |You shouldn't use ExecuteMultipleRequest or ExecuteTransactionRequest message request classes within the context of a plug-in or workflow activity.         |
+|[Avoid usage of batch request types in plug-ins and workflow activities](avoid-batch-requests-plugin.md)|You shouldn't use ExecuteMultipleRequest or ExecuteTransactionRequest message request classes within the context of a plug-in or workflow activity.|
 |[Develop IPlugin implementations as stateless](develop-iplugin-implementations-stateless.md)     |Members of classes that implement IPlugin are exposed to potential thread-safety issues which could lead to data inconsistency or performance problems.         |
 |[Do not duplicate plug-in step registration](do-not-duplicate-plugin-step-registration.md)     |Duplicate plug-in step registration will cause the plug-in to fire multiple times on the same message/event.         |
 |[Do not use parallel execution within plug-ins and workflow activities](do-not-use-parallel-execution-in-plug-ins.md)|Multi or parallel threading within plug-ins or custom workflow activities is not supported.|
@@ -39,6 +39,7 @@ This list below contains all of the guidance and best practices regarding the pl
 |[Set KeepAlive to false when interacting with external hosts in a plug-in](set-keepalive-false-interacting-external-hosts-plugin.md)     |KeepAlive property set to true in the HTTP request header or not explicitly defined as false can cause increased execution times of plug-ins.         |
 |[Set Timeout when making external calls in a plug-in](set-timeout-for-external-calls-from-plug-ins.md)     |Limit the time period that external calls will expect a response within plug-ins.|   
 |[Use InvalidPluginExecutionException in plug-ins and workflow activities](use-invalidpluginexecutionexception-plugin-workflow-activities.md)     |Use InvalidPluginExecutionException when raising errors within the context of a plug-in or workflow activity.         |
+|[Verify certification dependencies for plug-ins making outbound calls](verify-certification-dependencies.md)|Ensure that any certificates that your code depends on for outbound calls has a valid chain of certificates.|
 
 ### See Also
 

powerapps-docs/developer/common-data-service/best-practices/business-logic/verify-certification-dependencies.md

@@ -0,0 +1,63 @@
+---
+title: "Verify certification dependencies for plug-ins making outbound calls | MicrosoftDocs"
+description: "Ensure that any certificates that your code depends on for outbound calls has a valid chain of certificates."
+services: ''
+suite: powerapps
+documentationcenter: na
+author: JimDaly
+manager: ryjones
+editor: ''
+tags: ''
+ms.service: powerapps
+ms.devlang: na
+ms.topic: article
+ms.tgt_pltfrm: na
+ms.workload: na
+ms.date: 01/08/2020
+ms.author: jdaly
+search.audienceType: 
+  - developer
+search.app: 
+  - PowerApps
+  - D365CE
+---
+# Verify certification dependencies for plug-ins making outbound calls
+
+**Category**: Maintainability, Supportability
+
+**Impact potential**: High
+
+<a name='symptoms'></a>
+
+## Symptoms
+
+You may get this error when your plug-in makes an https call to an external resource:
+
+`WebException: The underlying connection was closed: Could not establish trust relationship for the SSL/TLS secure channel.`
+
+
+<a name='guidance'></a>
+
+## Guidance
+
+You should verify that the site you want to connect with has a valid chain of certificates. Use one of the online test tools such as [Qualys SSL Labs SSL Server Test](https://www.ssllabs.com/ssltest/analyze.html) to verify that the site provides a valid chain of certificates.
+
+
+<a name='additional'></a>
+
+## Additional information
+
+You may encounter this when connecting to a new endpoint for the first time or when something about the certificate has changed.
+
+When the code in your plug-in running in the sandbox attempts to connect to an external endpoint using https, the CDS Sandbox will start SSL/TLS negotiation. The endpoint presents a certificate to use for encryption. If the certificate has one or more intermediate certificates it must present the entire chain to successfully complete SSL/TLS negotiation. If the complete chain is not presented SSL/TLS communication cannot be established. 
+
+
+
+
+<a name='seealso'></a>
+
+### See also
+
+[Write a plug-in](../../write-plug-in.md) <br /> 
+[Set KeepAlive to false when interacting with external hosts in a plug-in](set-keepalive-false-interacting-external-hosts-plugin.md)<br /> 
+[Set Timeout when making external calls in a plug-in](set-timeout-for-external-calls-from-plug-ins.md)

powerapps-docs/developer/common-data-service/data-export-service.md

@@ -17,14 +17,14 @@ search.app:
 ---
 # Data export service
 
-Data Export is an add-on service made available as a Common Data Service solution that adds the ability to replicate Common Data Service data to a Microsoft Azure SQL Database store in a customer-owned Microsoft Azure subscription. The supported target destinations are Microsoft Azure SQL Database and Microsoft Azure SQL Server on Microsoft Azure virtual machines. Data Export intelligently synchronizes the entire Dynamics 365 schema and data initially and thereafter synchronizes on a continuous basis as changes occur (delta changes) in the Dynamics 365 (online) system.  
+Data Export is an add-on service made available as a Common Data Service solution that adds the ability to replicate Common Data Service data to a Microsoft Azure SQL Database store in a customer-owned Microsoft Azure subscription. The supported target destinations are Microsoft Azure SQL Database and Microsoft Azure SQL Server on Microsoft Azure virtual machines. Data Export intelligently synchronizes the entire Common Data Service schema and data initially and thereafter synchronizes on a continuous basis as changes occur (delta changes) in Common Data Service.  
 
- The Data Export service provides an interface for managing configuration and ongoing administration of this service from within Common Data Service.  For more information, see [Data Export](https://technet.microsoft.com/library/a70feedc-12b9-4a2d-baf0-f489cdcc177d). This topic explains the corresponding programmatic interface and issues for this service.  
+The Data Export service provides an interface for managing configuration and ongoing administration of this service from within Common Data Service.  For more information, see [Replicate data to Azure SQL Database](https://docs.microsoft.com/power-platform/admin/replicate-data-microsoft-azure-sql-database). This topic explains the corresponding programmatic interface and issues for this service.  
 
 ## Prerequisites for using the Data Export Service  
- Because this service requires access to an external Microsoft Azure SQL Database from Common Data Service,   a number of prerequisites must be satisfied before you can successfully access this service. The following perquisites are more fully explained from an administrator's perspective in the section [Prerequisites for using Data Export Service](https://technet.microsoft.com/library/mt744592.aspx).  
+ Because this service requires access to an external Microsoft Azure SQL Database from Common Data Service, a number of prerequisites must be satisfied before you can successfully access this service. The following perquisites are more fully explained from an administrator's perspective in the section [Prerequisites for using Data Export Service](/power-platform/admin/replicate-data-microsoft-azure-sql-database#prerequisites-for-using-).  
 
- Your Common Data Service service must be configured so that:  
+ Your Common Data Service environment must be configured so that:  
 
 - The entities that will be exported are enabled with change tracking. For more information, see [Use change tracking to synchronize data with external systems](use-change-tracking-synchronize-data-external-systems.md).  
 

powerapps-docs/developer/common-data-service/discovery-service.md

@@ -1,31 +1,33 @@
 ---
-title: "Discovery Services (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "Common Data Service Discovery service is accessed through either the Web API or the Organization Service."
+title: "Discovery Service (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
+description: "Learn about access to the Discovery Service for discovering business organization instance details."
 ms.custom: ""
-ms.date: 10/31/2018
-ms.reviewer: ""
+ms.date: 1/16/2019
+ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
 author: "JimDaly" # GitHub ID
 ms.author: "jdaly" # MSFT alias of Microsoft employees only
-manager: "ryjones" # MSFT alias of manager or PM counterpart
+manager: "kvivek" # MSFT alias of manager or PM counterpart
 search.audienceType: 
   - developer
 search.app: 
   - PowerApps
   - D365CE
 ---
-# Discovery Services
+# Discovery Service
 
 [!INCLUDE [cc-discovery-service-description](includes/cc-discovery-service-description.md)]
 
+The Discovery Service is accessed through two different APIs:
 
-A Discovery service is accessed through either the Web API or the Organization Service.
+- For the OData V4 RESTful API: [Discover the URL for your organization](webapi/discover-url-organization-web-api.md)
+- For the discovery API available through the 2011 (SOAP) endpoint: [Use the Discovery Service with the Microsoft.Xrm.Sdk.Discovery NameSpace](org-service/discovery-service.md)
 
-- For the Web API: [Discover the URL for your organization using the Web API](webapi/discover-url-organization-web-api.md)
-- For the Organization Service: [Use the Discovery Service with the Microsoft.Xrm.Sdk.Discovery NameSpace](org-service/discovery-service.md)
+> [!NOTE]
+> The *regional* Discovery Service is deprecated. More information: [Important changes (deprecations)](/power-platform/important-changes-coming.md).
 
 ### See Also
 
 [Use the Common Data Service Web API](webapi/overview.md)<br />
-[Use the Common Data Service Organization Service](org-service/overview.md)
+[Modify your code to use global Discovery Service](webapi/discovery-orgsdk-to-webapi.md)

powerapps-docs/developer/common-data-service/image-attributes.md

@@ -256,8 +256,7 @@ byte[]
 In the above request, the next block of data is being uploaded. After all image data has been received by the web service, a thumbnail image is automatically created by the web service.
 
 ### See also  
-[Sample: Set and retrieve entity images](/dynamics365/customer-engagement/developer/sample-set-retrieve-entity-images)
 [File attributes](file-attributes.md)  
 [Introduction to Entities in Dynamics 365](/dynamics365/customer-engagement/developer/introduction-entities)   
- [Introduction to entity attributes in Dynamics 365](/dynamics365/customer-engagement/developer/introduction-entity-attributes)   
- [Sample: Set and retrieve entity images](/dynamics365/customer-engagement/developer/sample-set-retrieve-entity-images)
+[Introduction to entity attributes in Dynamics 365](/dynamics365/customer-engagement/developer/introduction-entity-attributes)   
+[Sample: Set and retrieve entity images](/dynamics365/customerengagement/on-premises/developer/sample-set-retrieve-entity-images)

powerapps-docs/developer/common-data-service/media/system-jobs-more-actions-commands.png

@@ -43,8 +43,8 @@
         href: page-large-result-sets-with-queryexpression.md
       - name: Use a left outer join in QueryExpression to query for records "not in"
         href: use-left-outer-join-queryexpression-query-records-not-in.md
-      - name: Use the QueryByAttribute class
-        href: use-querybyattribute-class.md
+    - name: Use the QueryByAttribute class
+      href: use-querybyattribute-class.md
   - name: Create entities
     href: entity-operations-create.md
   - name: Retrieve an entity

powerapps-docs/developer/common-data-service/org-service/TOC.yml

@@ -1,14 +1,14 @@
 ---
 title: "Use the Discovery Service with the SDK Assemblies (Common Data Service) | Microsoft Docs" # Intent and product brand in a unique string of 43-59 chars including spaces
-description: "Describes how to use the discovery service with the .NET SDK assemblies." # 115-145 characters including spaces. This abstract displays in the search result.
+description: "Describes how to use the Discovery Service with the APIs available in the SDK assemblies." # 115-145 characters including spaces. This abstract displays in the search result.
 ms.custom: ""
-ms.date: 10/31/2018
-ms.reviewer: ""
+ms.date: 1/16/2020
+ms.reviewer: "pehecke"
 ms.service: powerapps
 ms.topic: "article"
 author: "JimDaly" # GitHub ID
 ms.author: "jdaly" # MSFT alias of Microsoft employees only
-manager: "ryjones" # MSFT alias of manager or PM counterpart
+manager: "kvivek" # MSFT alias of manager or PM counterpart
 search.audienceType: 
   - developer
 search.app: 
@@ -17,10 +17,14 @@ search.app:
 ---
 # Use the Discovery Service with the SDK Assemblies
 
-[!INCLUDE [cc-discovery-service-description](../includes/cc-discovery-service-description.md)]
+> [!IMPORTANT]
+> Effective March 2, 2020, the *regional* Discovery Service will be [deprecated](/power-platform/important-changes-coming#regional-discovery-service-is-deprecated).
+> 
+> For information on how to transition to use the *global* Discovery Service, see [Modify your code to use global Discovery Service](../webapi/discovery-orgsdk-to-webapi.md).
 
+[!INCLUDE [cc-discovery-service-description](../includes/cc-discovery-service-description.md)]
 
-To use the discovery service using the SDK assemblies, add a reference to the `Microsoft.Xrm.Sdk.dll` assembly to your Visual Studio project, and then add a `using` statement to access the <xref:Microsoft.Xrm.Sdk.Discovery> namespace. 
+To access the Discovery Service using the SDK assembly APIs, add a reference to the `Microsoft.Xrm.Sdk.dll` assembly in your Visual Studio project, and then add a `using` statement to access the <xref:Microsoft.Xrm.Sdk.Discovery> namespace.
 
 The <xref:Microsoft.Xrm.Sdk.WebServiceClient.DiscoveryWebProxyClient> implements the <xref:Microsoft.Xrm.Sdk.Discovery.IDiscoveryService> interface.
 
@@ -33,7 +37,7 @@ When you instantiate the <xref:Microsoft.Xrm.Sdk.WebServiceClient.DiscoveryWebPr
 [!INCLUDE [regional-discovery-services](../../../includes/regional-discovery-services.md)]
 
 > [!NOTE]
-> If you do not know the user's region, you need to loop through the available regions until you get results. The Web API provides a single global discovery service. More information: [Discover the URL for your organization using the Web API](../webapi/discover-url-organization-web-api.md)
+> If you do not know the user's region, you need to loop through the available regions until you get results. A single global Discovery Service is also available. More information: [Discover the URL for your organization](../webapi/discover-url-organization-web-api.md)
 
 ## Discovery service messages
 
@@ -160,4 +164,4 @@ Endpoints:
 ### See also
 
 [Discovery Services](../discovery-service.md)<br />
-[Discover the URL for your organization using the Web API](../webapi/discover-url-organization-web-api.md)
+[Discover the URL for your organization](../webapi/discover-url-organization-web-api.md)