Merge pull request MicrosoftDocs#4794 from MicrosoftDocs/master

updating working

Author: mduelae

.gitignore

@@ -19,3 +19,4 @@ powerapps-docs/.vs/ProjectSettings.json
 powerapps-docs/.vs/slnx.sqlite
 powerapps-docs/.vs/VSWorkspaceState.json
 /.vs/slnx.sqlite-journal
+powerapps-docs/teams/media/milestones-broad-distribution/Thumbs.db

powerapps-docs/developer/data-platform/org-service/discovery-service.md

@@ -25,146 +25,15 @@ search.app:
 
 [!INCLUDE [cc-discovery-service-description](../includes/cc-discovery-service-description.md)]
 
-To access the Discovery Service using 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.
-
-The <xref:Microsoft.Xrm.Sdk.Discovery.IDiscoveryService> interface provides <xref:Microsoft.Xrm.Sdk.Discovery.IDiscoveryService.Execute(Microsoft.Xrm.Sdk.Discovery.DiscoveryRequest)> method you will use to pass a instance of the abstract <xref:Microsoft.Xrm.Sdk.Discovery.DiscoveryRequest> class.
-
-## Regional Discovery services
-
-When you instantiate the <xref:Microsoft.Xrm.Sdk.WebServiceClient.DiscoveryWebProxyClient> you will need to provide a URL for a regional data center using one of the following values.
-
-[!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. 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
-
-There are three messages that you can use which all inherit from the abstract <xref:Microsoft.Xrm.Sdk.Discovery.DiscoveryRequest> class.
-
- The following table lists the messages that are supported with <xref:Microsoft.Xrm.Sdk.Discovery.IDiscoveryService.Execute(Microsoft.Xrm.Sdk.Discovery.DiscoveryRequest)> method.  
-  
-|Message|Description|  
-|-------------|-----------------|  
-|<xref:Microsoft.Xrm.Sdk.Discovery.RetrieveUserIdByExternalIdRequest>|Retrieves the logged-on user's ID in Microsoft Dataverse|  
-|<xref:Microsoft.Xrm.Sdk.Discovery.RetrieveOrganizationRequest>|Retrieves information about a single organization.|  
-|<xref:Microsoft.Xrm.Sdk.Discovery.RetrieveOrganizationsRequest>|Retrieves information about all organizations to which the user belongs.|  
-
-## Example
-
-The following code for a console application uses the <xref:Microsoft.Xrm.Sdk.Discovery.RetrieveOrganizationsRequest> message to retrieve all the organizations for a user.
-
-```csharp
-using System;
-using System.Linq;
-using Microsoft.Xrm.Sdk.Discovery;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
-using Microsoft.Xrm.Sdk.WebServiceClient;
-
-namespace DiscoveryServiceSample
-{
-    class Program
-    {
-        //These sample application registration values are available for all online instances.
-        // this sample requires ADAL.net 5.2 or later
-        public static string clientId = "51f81489-12ee-4a9e-aaae-a2591f45987d";
-
-        static OrganizationDetailCollection GetOrganizationDetails(DiscoveryWebProxyClient svc)
-        {
-
-            var request = new RetrieveOrganizationsRequest()
-            {
-                AccessType = EndpointAccessType.Default,
-                Release = OrganizationRelease.Current
-            };
-            try
-            {
-                var response = (RetrieveOrganizationsResponse)svc.Execute(request);
-                return response.Details;
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-        static void Main(string[] args)
-        {
-            string authority = @"https://login.microsoftonline.com/common";
-            string northAmericaResourceUrl = "https://disco.crm.dynamics.com";
-            string discoveryUrl = $"{northAmericaResourceUrl}/XRMServices/2011/Discovery.svc/web";
-            Uri discoveryUri = new Uri(discoveryUrl);
-
-            AuthenticationContext authContext = new AuthenticationContext(authority, false);
-            string username = "[email protected]";
-            string password = "yourPassword"; 
-
-            AuthenticationResult authResult = null;
-            if (username != string.Empty && password != string.Empty)
-            {
-                UserPasswordCredential cred = new UserPasswordCredential(username, password);
-                authResult = authContext.AcquireTokenAsync(northAmericaResourceUrl, clientId, cred).Result;
-            }
-
-           
-            using (var svc = new DiscoveryWebProxyClient(discoveryUri))
-            {
-                svc.HeaderToken = authResult.AccessToken;
-
-                OrganizationDetailCollection details = GetOrganizationDetails(svc);
-
-                details.ToList().ForEach(x =>
-                {
-                    Console.WriteLine("Organization Name: {0}", x.FriendlyName);
-                    Console.WriteLine("Unique Name: {0}", x.UniqueName);
-                    Console.WriteLine("Endpoints:");
-                    foreach (var endpoint in x.Endpoints)
-                    {
-                        Console.WriteLine("  Name: {0}", endpoint.Key);
-                        Console.WriteLine("  URL: {0}", endpoint.Value);
-                    }
-                    Console.WriteLine();
-                });
-            };
-            Console.ReadLine();
-        }
-    }
-}
-
-```
-
-The results may look like this for a user with access to two instances:
-
-```
-Organization Name: Organization A
-Unique Name: orga
-Endpoints:
-  Name: WebApplication
-  URL: https://orgaservice.crm.dynamics.com/
-  Name: OrganizationService
-  URL: https://orgaservice.api.crm.dynamics.com/XRMServices/2011/Organization.svc
-  Name: OrganizationDataService
-  URL: https://orgaservice.api.crm.dynamics.com/XRMServices/2011/OrganizationData.svc
-
-Organization Name: Organization B
-Unique Name: orgb
-Endpoints:
-  Name: WebApplication
-  URL: https://orgbservice.crm.dynamics.com/
-  Name: OrganizationService
-  URL: https://orgbservice.api.crm.dynamics.com/XRMServices/2011/Organization.svc
-  Name: OrganizationDataService
-  URL: https://orgbservice.api.crm.dynamics.com/XRMServices/2011/OrganizationData.svc
-```
-
-> [!NOTE]
-> The `OrganizationDataService` is the deprecated Organization Data Service, not the Web API. This service does not include a URL for the Web API.
+ - Regional Discovery Services are no longer avaialble.
+ - To access Global Discovery functionality with the SDK going fowarded, see [here](/powerapps-docs/developer/data-platform/org-service/samples/access-discovery-service.md)
 
+## Globla Discovery Service Endpoints:
+[!INCLUDE [global-discovery-services](../../../includes/global-discovery-services.md)]
 
 ### See also
 
-[Discovery Services](../discovery-service.md)<br />
+[Global Discovery Service Sample](https://github.com/Microsoft/PowerApps-Samples/tree/master/cds/orgsvc/C%23/DiscoveryService)<br />
 [Discover the URL for your organization](../webapi/discover-url-organization-web-api.md)
 
-[!INCLUDE[footer-include](../../../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../../../includes/footer-banner.md)]

powerapps-docs/developer/data-platform/org-service/samples/access-discovery-service.md

@@ -29,7 +29,7 @@ If you have set  and  values in the App.config connection strings, it will use t
 
 ## What this sample does
 
-This sample uses the SDK Assembly `DiscoveryServiceProxy` to query the discovery service with a user's credentials to determine which environments they can connect with.
+This sample uses the SDK Assembly `CrmServiceClient` to query the global discovery service with a user's credentials to determine which environments they can connect with.
 
 If one or more environments are returned, the sample will prompt the user to choose one, and then use a `WhoAmIRequest` to return the `SystemUser.UserId` for that environment.
 
@@ -43,17 +43,17 @@ This sample requires no special setup except that there are valid user credentia
 
 If you know the regional data center that your environments are in, the sample will run faster if you set this value at line 40 of the SampleProgram.cs file.
 
-In SampleMethods.cs there is a `DataCenter` enumeration for each of the known data centers. Each enumeration member is decorated with a `Description` notation. All of these members except `Unknown` have the URL for the regional discovery service set as the description. 
+In SampleMethods.cs there is a `Clouds` enumeration for each of the known global discovery centers. Each enumeration member is decorated with a `Description` notation. All of these members except `Unknown` have the URL for the global discovery service set as the description. 
 
 
 ### Demonstrate
 
-1. Using the user credentials and the `dataCenter` value, the program uses the `GetAllOrganizations` static method to retrieve all known environments for the user.
-1. The `GetAllOrganizations`method detects whether the `dataCenter` value is set to `DataCenter.Unknown`. If it is set to this member, this method will loop through all the other members in the `DataCenter` enum and retrieve any environments that are found using the `GetOrganizationsForDataCenter` static method.
+1. Using the user credentials and the `cloud` value, the program uses the `GetAllOrganizations` static method to retrieve all known environments for the user.
+1. The `GetAllOrganizations`method detects whether the `cloud` value is set to `Cloud.Unknown`. If it is set to this member, this method will choose the commerical `Cloud` enum and retrieve any environments that are found using the `GetOrganizationsForCloud` static method.
 
-    If a specific data center is set, `GetAllOrganizations` will simply call `GetOrganizationsForDataCenter` with those values.
+    If a specific data center is set, `GetAllOrganizations` will simply call `GetOrganizationsForCloud` with those values.
 
-1. The `GetOrganizationsForDataCenter` method extracts the data center discovery service Url from the member `Description` decoration and uses it together with the user credentials to execute the `RetrieveOrganizationsRequest` discovery service message.
+1. The `GetOrganizationsForCloud` method extracts the cloud's discovery service Url from the member `Description` decoration and uses it together with the user credentials to execute the `DiscoverGlobalOrganizations` CrmServiceClient helper message.
 
     A `System.ServiceModel.Security.SecurityAccessDeniedException` is expected when the user has no environments in a specific data center.
 

powerapps-docs/includes/global-discovery-services.md

@@ -0,0 +1,7 @@
+|Location|Global Discovery Web service URL|
+|--------------|-------------------------------| 
+|Commercial|`https://disco.crm.dynamics.com/XRMServices/2011/Discovery.svc`|
+|North America 2 (GCC)|`https://globaldisco.crm9.dynamics.com`|
+|US Government L5 (DOD)|`https://globaldisco.crm.appsplatform.us`|
+|US Government L4 (USG)|`https://globaldisco.crm.microsoftdynamics.us`|
+|China operated by 21Vianet|`https://globaldisco.crm.dynamics.cn`|

powerapps-docs/maker/TOC.yml

@@ -77,7 +77,7 @@
         href: ../user/deactivate-activate-account-contact.md 
     - name: Work with activities
       items:
-      - name: Add activities to the timeline
+      - name: Use timeline
         href: ../user/add-activities.md
       - name: FAQs about activities
         href: ../user/faq-for-timeline-and-activity.md
@@ -675,6 +675,8 @@
             href: ./canvas-apps/functions/operators.md#in-and-exactin-operators
           - name: IsBlank
             href: ./canvas-apps/functions/function-isblank-isempty.md
+          - name: IsBlankOrError
+            href: ./canvas-apps/functions/function-iferror.md            
           - name: IsEmpty
             href: ./canvas-apps/functions/function-isblank-isempty.md
           - name: IsError
@@ -1425,10 +1427,16 @@
           href: ./portals/configure/configure-site-settings.md
         - name: Work with forms and lists in portals
           items:
-            - name: Work with basic forms
-              href: ./portals/configure/entity-forms.md
             - name: Work with lists
               href: ./portals/configure/entity-lists.md
+            - name: Work with basic forms
+              items:
+                - name: Work with basic forms
+                  href: ./portals/configure/entity-forms.md
+                - name: Configure basic form metadata
+                  href: ./portals/configure/configure-basic-form-metadata.md
+                - name: Configure basic form subgrid
+                  href: ./portals/configure/configure-basic-form-subgrid.md
             - name: Work with advanced forms
               items:
                 - name: Define advanced form properties
@@ -1795,7 +1803,7 @@
           href: ./portals/customer-engagement-apps/integrate-project-service-automation.md
         - name: Integrate Field Service
           href: ./portals/customer-engagement-apps/integrate-field-service.md
-    - name: Important upcoming changes and depecations
+    - name: Important upcoming changes and deprecations
       href: ./portals/important-changes-deprecations.md
     - name: Supported web browsers
       href: ./portals/supported-web-browsers.md
@@ -2198,8 +2206,14 @@
           items:
              - name: Milestones
                href: ../teams/milestones.md
-             - name: Understand Milestones sample app architecture
-               href: ../teams/milestones-architecture.md
+             - name: Deploy the Milestones app broadly in your organization
+               href: ../teams/milestones-broad-distribution.md
+             - name: Customize Milestones app
+               items:
+                 - name: Understand Milestones sample app architecture
+                   href: ../teams/milestones-architecture.md
+                 - name: Customize Milestones sample app
+                   href: ../teams/customize-milestones.md
         - name: Perspectives (Preview)
           items:
             - name: Perspectives
@@ -2210,6 +2224,8 @@
           items:
             - name: Use the Profile+ sample app 
               href: ../teams/profile-app.md
+            - name: Deploy the Profile+ app broadly in your organization
+              href: ../teams/deploy-profile-plus-broad-distribution.md
             - name: Customize Profile+ app
               items:
                 - name: Understand Profile+ sample app architecture