Merge pull request #107998 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 979aeb5453e1 · 2020-03-17T14:38:46.000-07:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/active-directory/develop/sample-v2-code.md b/articles/active-directory/develop/sample-v2-code.md
@@ -44,9 +44,9 @@ These samples show how to write a single-page application secured with Microsoft
 | -------- | --------------------- | -------- |
 | ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls Microsoft Graph |[javascript-graphapi-v2](https://github.com/Azure-Samples/active-directory-javascript-graphapi-v2) |
 | ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[b2c-javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) |
-| ![This image shows the JavaScript logo](media/sample-v2-code/logo_js.png) [JavaScript (msal.js)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls own web API |[javascript-singlepageapp-dotnet-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-dotnet-webapi-v2) |
 | ![This image shows the Angular JS logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL AngularJS)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angularjs)| Calls Microsoft Graph  | [MsalAngularjsDemoApp](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/MsalAngularjsDemoApp)
 | ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular)| Calls Microsoft Graph  | [javascript-singlepageapp-angular](https://github.com/Azure-Samples/active-directory-javascript-singlepageapp-angular) |
+| ![This image shows the Angular logo](media/sample-v2-code/logo_angular.png) [JavaScript (MSAL Angular)](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-core) | Calls B2C |[active-directory-b2c-javascript-angular-spa](https://github.com/Azure-Samples/active-directory-b2c-javascript-angular-spa) |
 
 ## Web applications
 
@@ -58,7 +58,6 @@ The following samples illustrate web applications that sign in users. Some sampl
 | ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NETframework.png)</p> ASP.NET | [ASP.NET Quickstart](https://github.com/AzureAdQuickstarts/AppModelv2-WebApp-OpenIDConnect-DotNet) </p> [dotnet-webapp-openidconnect-v2](https://github.com/azure-samples/active-directory-dotnet-webapp-openidconnect-v2)  |  [dotnet-admin-restricted-scopes-v2](https://github.com/azure-samples/active-directory-dotnet-admin-restricted-scopes-v2) </p> |[msgraph-training-aspnetmvcapp](https://github.com/microsoftgraph/msgraph-training-aspnetmvcapp)
 | ![This image shows the Java logo](media/sample-v2-code/logo_java.png)  |                   | [ms-identity-java-webapp](https://github.com/Azure-Samples/ms-identity-java-webapp) |
 | ![This image shows the Python logo](media/sample-v2-code/logo_python.png)  |                   | [ms-identity-python-webapp](https://github.com/Azure-Samples/ms-identity-python-webapp) |
-| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png)  |                   | [Node.js Quickstart](https://github.com/azureadquickstarts/appmodelv2-webapp-openidconnect-nodejs) |
 | ![This image shows the Ruby logo](media/sample-v2-code/logo_ruby.png) |                   | [msgraph-training-rubyrailsapp](https://github.com/microsoftgraph/msgraph-training-rubyrailsapp) |
 
 ## Desktop and mobile public client apps
@@ -111,6 +110,7 @@ The following samples show how to protect a web API with the Microsoft identity
 | ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
 | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | Web API (service) of [ms-identity-java-webapi](https://github.com/Azure-Samples/ms-identity-java-webapi) |
 | ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | Web API (service) of [active-directory-javascript-nodejs-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-nodejs-webapi-v2) |
+| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | B2C Web API (service) of [active-directory-b2c-javascript-nodejs-webapi](https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi) |
 
 ## Azure Functions as web APIs
 
diff --git a/articles/active-directory/saas-apps/promaster-tutorial.md b/articles/active-directory/saas-apps/promaster-tutorial.md
@@ -125,8 +125,8 @@ To configure Azure AD single sign-on with ProMaster (by Inlogik), perform the fo
 
     | |
 	| - |-|
-	| `https://secure.inlogik.com/<COMPANYNAME>/saml/acs`|
-	| `https://<CUSTOMDOMAIN>/SAMLBASE/saml/acs`|
+	| `https://secure.inlogik.com/<COMPANYNAME>`|
+	| `https://<CUSTOMDOMAIN>/SAMLBASE`|
 	| |
 
 	> [!NOTE]
diff --git a/articles/azure-functions/functions-dotnet-dependency-injection.md b/articles/azure-functions/functions-dotnet-dependency-injection.md
@@ -80,6 +80,7 @@ using Microsoft.Azure.WebJobs;
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
+using System.Net.Http;
 
 namespace MyNamespace
 {
@@ -88,10 +89,10 @@ namespace MyNamespace
         private readonly IMyService _service;
         private readonly HttpClient _client;
 
-        public HttpTrigger(IMyService service, IHttpClientFactory httpClientFactory)
+        public HttpTrigger(IMyService service, HttpClient httpClient)
         {
             _service = service;
-            _client = httpClientFactory.CreateClient();
+            _client = httpClient;
         }
 
         [FunctionName("GetPosts")]
diff --git a/articles/azure-resource-manager/managed-applications/overview.md b/articles/azure-resource-manager/managed-applications/overview.md
@@ -14,7 +14,7 @@ Azure managed applications enable you to offer cloud solutions that are easy for
 A managed application is similar to a solution template in the Marketplace, with one key difference. In a managed application, the resources are deployed to a resource group that's managed by the publisher of the app. The resource group is present in the consumer's subscription, but an identity in the publisher's tenant has access to the resource group. As the publisher, you specify the cost for ongoing support of the solution.
 
 > [!NOTE]
-> Formerly, the documentation for Azure Customer Providers was included with the documentation for Managed Applications. That documentation has been moved. Now, see [Azure Custom Providers](../custom-providers/overview.md).
+> Formerly, the documentation for Azure Custom Providers was included with the documentation for Managed Applications. That documentation has been moved. Now, see [Azure Custom Providers](../custom-providers/overview.md).
 
 ## Advantages of managed applications
 
diff --git a/articles/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service.md b/articles/blockchain/templates/hyperledger-fabric-consortium-azure-kubernetes-service.md
@@ -74,7 +74,7 @@ To get started with the HLF network components deployment, navigate to the [Azur
     ![Hyperledger Fabric on Azure Kubernetes Service Template](./media/hyperledger-fabric-consortium-azure-kubernetes-service/create-for-hyperledger-fabric-settings.png)
 
 5. Enter the following details:
-    - **Organization name**: The name of the Fabric organization, which is required for various data plane operations.
+    - **Organization name**: The name of the Fabric organization, which is required for various data plane operations. The organization name needs to be unique per deployment. 
     - **Fabric network component**: Choose either Ordering Service or Peer nodes based on Blockchain network component you want to setup.
     - **Number of nodes** - The following are the two types of nodes:
         - Ordering service - select the number of nodes to provided fault tolerance to the network. Only 3,5 and 7 are the supported orderer node count.
diff --git a/articles/marketplace/cloud-partner-portal/test-drive/azure-resource-manager-test-Drive.md b/articles/marketplace/cloud-partner-portal/test-drive/azure-resource-manager-test-Drive.md
@@ -88,7 +88,7 @@ It is also important to note that **all parameters are optional**, so if you don
 | **password**    | secure string    | New random password | Lp!ACS\^2kh     |
 | **session id**   | string          | Unique Test Drive session ID (GUID)    | b8c8693e-5673-449c-badd-257a405a6dee |
 
-#### username
+#### baseuri
 
 Test Drive initializes this parameter with a **Base Uri** of your deployment package, so you can use this parameter to construct Uri of any file included into your package.
 
diff --git a/articles/site-recovery/site-recovery-failover.md b/articles/site-recovery/site-recovery-failover.md
@@ -106,7 +106,7 @@ In some cases, VM failover requires intermediate step that usually takes around
 You might want to automate actions during failover. To do this, you can use scripts or Azure automation runbooks in recovery plans.
 
 - [Learn](site-recovery-create-recovery-plans.md) about creating and customizing recovery plans, including adding scripts.
-- [Learn](site-recovery-runbook-automation.md) abut adding Azure Automation runbooks to recovery plans.
+- [Learn](site-recovery-runbook-automation.md) about adding Azure Automation runbooks to recovery plans.
 
 
 ## Configure settings after failover
diff --git a/articles/sql-data-warehouse/release-notes-10-0-10106-0.md b/articles/sql-data-warehouse/release-notes-10-0-10106-0.md
@@ -22,7 +22,7 @@ This article summarizes the new features and improvements in the recent releases
 
 As new features are rolled out to all regions, check the version deployed to your instance and the latest release notes for feature availability. To check the version, connect to your SQL pool via SQL Server Management Studio (SSMS) and run `SELECT @@VERSION;` to return the current version.
 
-Use the version identified to confirm which release has been applied to your SQL pool.
+Use the version identified to confirm which release has been applied to your SQL pool. The date in the output identifies the month for the release applied to your SQL pool.
 
 > [!NOTE]
 > By June 2020, the product name returned by SELECT @@VERSION will change from Microsoft Azure SQL Data Warehouse to Azure Synapse Analytics. We will publish the schedule in our release notes. This change is relevant for customers who parse product name from the result of SELECT @@VERSION in their application code. To avoid application code changes due to product rebranding, please use these commands to query SERVERPROPERTY for the database product name and version:
diff --git a/articles/virtual-machines/linux/use-remote-desktop.md b/articles/virtual-machines/linux/use-remote-desktop.md
@@ -45,7 +45,7 @@ Next, install xfce using `apt` as follows:
 
 ```bash
 sudo apt-get update
-sudo apt-get install xfce4
+sudo apt-get -y install xfce4
 ```
 
 ## Install and configure a remote desktop server
diff --git a/articles/virtual-machines/troubleshooting/boot-diagnostics.md b/articles/virtual-machines/troubleshooting/boot-diagnostics.md
@@ -15,9 +15,9 @@ ms.author: delhan
 
 # How to use boot diagnostics to troubleshoot virtual machines in Azure
 
-There can be many reasons that a virtual machine enters a non-bootable state. To address issues with your virtual machines created using Resource Manager deployment model you can use the following debugging features: Console Output and Screenshot support for Azure virtual machines. 
+There can be many reasons that a virtual machine enters a non-bootable state. To address issues with your virtual machines created using Resource Manager deployment model, you can use the following debugging features: Console Output and Screenshot support for Azure virtual machines. 
 
-For Linux virtual machines, you can view the output of your console log from the Portal. For both Windows and Linux virtual machines, Azure enables you to see a screenshot of the VM from the hypervisor. Both features are supported for Azure virtual machines in all regions. Note, screenshots, and output can take up to 10 minutes to appear in your storage account.
+For Linux virtual machines, you can view the output of your console log from the Portal. For both Windows and Linux virtual machines, Azure enables you to see a screenshot of the VM from the hypervisor. Both features are supported for Azure virtual machines in all regions. Note, screenshots and output can take up to 10 minutes to appear in your storage account.
 
 You can select the **Boot diagnostics** option to view the log and the screenshot.
 
diff --git a/articles/virtual-machines/troubleshooting/troubleshoot-activation-problems.md b/articles/virtual-machines/troubleshooting/troubleshoot-activation-problems.md
@@ -42,9 +42,9 @@ Generally, Azure VM activation issues occur if the Windows VM is not configured
 ## Solution
 
 >[!NOTE]
->If you are using a site-to-site VPN and forced tunneling, see [Use Azure custom routes to enable KMS activation with forced tunneling](https://blogs.msdn.com/b/mast/archive/2015/05/20/use-azure-custom-routes-to-enable-kms-activation-with-forced-tunneling.aspx). 
+>If you are using a site-to-site VPN and forced tunneling, see [Use Azure custom routes to enable KMS activation with forced tunneling](https://docs.microsoft.com/azure/vpn-gateway/vpn-gateway-about-forced-tunneling). 
 >
->If you are using ExpressRoute and you have a default route published, see [Azure VM may fail to activate over ExpressRoute](https://blogs.msdn.com/b/mast/archive/2015/12/01/azure-vm-may-fail-to-activate-over-expressroute.aspx).
+>If you are using ExpressRoute and you have a default route published, see [Can I block Internet connectivity to virtual networks connected to ExpressRoute circuits?](https://docs.microsoft.com/azure/expressroute/expressroute-faqs).
 
 ### Step 1 Configure the appropriate KMS client setup key
 
@@ -98,7 +98,9 @@ For the VM that is created from a custom image, you must configure the appropria
   
     Also make sure that the outbound network traffic to KMS endpoint with 1688 port is not blocked by the firewall in the VM.
 
-5. After you verify successful connectivity to kms.core.windows.net, run the following command at that elevated Windows PowerShell prompt. This command tries activation multiple times.
+5. Verify using [Network Watcher Next Hop](https://docs.microsoft.com/azure/network-watcher/network-watcher-next-hop-overview) that the next hop type from the VM in question to the destination IP 23.102.135.246 (for kms.core.windows.net) or the IP of the appropriate KMS endpoint that applies to your region is **Internet**.  If the result is VirtualAppliance or VirtualNetworkGateway, it is likely that a default route exists.  Contact your network adminstrator and work with them to determine the correct course of action.  This may be a [custom route](https://docs.microsoft.com/azure/virtual-machines/troubleshooting/custom-routes-enable-kms-activation) if that solution is consistent with your organization's policies.
+
+6. After you verify successful connectivity to kms.core.windows.net, run the following command at that elevated Windows PowerShell prompt. This command tries activation multiple times.
 
     ```powershell
     1..12 | ForEach-Object { Invoke-Expression "$env:windir\system32\cscript.exe $env:windir\system32\slmgr.vbs /ato" ; start-sleep 5 }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ using Microsoft.Azure.WebJobs;`
`80`	`80`	`using Microsoft.Azure.WebJobs.Extensions.Http;`
`81`	`81`	`using Microsoft.AspNetCore.Http;`
`82`	`82`	`using Microsoft.Extensions.Logging;`
	`83`	`+using System.Net.Http;`
`83`	`84`
`84`	`85`	`namespace MyNamespace`
`85`	`86`	`{`
`@@ -88,10 +89,10 @@ namespace MyNamespace`
`88`	`89`	`private readonly IMyService _service;`
`89`	`90`	`private readonly HttpClient _client;`
`90`	`91`
`91`		`- public HttpTrigger(IMyService service, IHttpClientFactory httpClientFactory)`
	`92`	`+ public HttpTrigger(IMyService service, HttpClient httpClient)`
`92`	`93`	`{`
`93`	`94`	`_service = service;`
`94`		`- _client = httpClientFactory.CreateClient();`
	`95`	`+ _client = httpClient;`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`[FunctionName("GetPosts")]`