Merge pull request #111409 from julieMSFT/release-ignite-arcadia

Dirty PR to resolve merge conflicts with master in release-ignite-arcadia

Author: ktoliver

.openpublishing.redirection.json

@@ -5504,7 +5504,12 @@
     },
     {
       "source_path": "articles/managed-applications/publish-managed-app-definition-quickstart.md",
-      "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/managed-applications/publish-managed-app-definition-quickstart.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
       "redirect_document_id": false
     },
     {

articles/active-directory/saas-apps/blink-provisioning-tutorial.md

@@ -117,7 +117,7 @@ This section guides you through the steps to configure the Azure AD provisioning
 
 9. Review the user attributes that are synchronized from Azure AD to Blink in the **Attribute Mapping** section. The attributes selected as **Matching** properties are used to match the user accounts in Blink for update operations. Select the **Save** button to commit any changes.
 
-	![Blink User Attributes](media/blink-provisioning-tutorial/User_attributes.png)
+	![Blink User Attributes](media/blink-provisioning-tutorial/user-attributes.png)
 
 10. To configure scoping filters, refer to the following instructions provided in the [Scoping filter tutorial](../app-provisioning/define-conditional-rules-for-provisioning-user-accounts.md).
 

articles/active-directory/saas-apps/envoy-provisioning-tutorial.md

@@ -10,6 +10,9 @@
     href: analysis-services-create-server.md
   - name: Create a server - PowerShell
     href: analysis-services-create-powershell.md
+  - name: Create a server - ARM template
+    displayName: Resource Manager
+    href: analysis-services-create-template.md
   - name: Configure server firewall - Portal
     href: analysis-services-qs-firewall.md
 - name: Tutorials

articles/active-directory/saas-apps/media/blink-provisioning-tutorial/user-attributes.png

@@ -0,0 +1,103 @@
+---
+title: Quickstart - Create an Azure Analysis Services server resource by using Azure Resource Manager template
+description: Quickstart showing how to an Azure Analysis Services server resource by using an Azure Resource Manager template.
+author: minewiskan
+ms.author: owend
+tags: azure-resource-manager
+ms.service: analysis-services
+ms.topic: quickstart
+ms.date: 04/14/2020
+ms.custom: subject-armqs
+
+#Customer intent: As a BI developer who is new to Azure, I want to use Azure Analysis Services to store and manage my organizations data models.
+
+---
+
+# Quickstart: Create a server - Azure Resource Manager template
+
+This quickstart describes how to create an Analysis Services server resource in your Azure subscription by using a Resource Manager template.
+
+[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
+
+## Prerequisites
+
+* **Azure subscription**: Visit [Azure Free Trial](https://azure.microsoft.com/offers/ms-azr-0044p/) to create an account.
+* **Azure Active Directory**: Your subscription must be associated with an Azure Active Directory tenant. And, you need to be signed in to Azure with an account in that Azure Active Directory. To learn more, see [Authentication and user permissions](analysis-services-manage-users.md).
+
+## Create a server
+
+### Review the template
+
+The template used in this quickstart is from [Azure Quickstart templates](https://azure.microsoft.com/resources/templates/101-analysis-services-create/).
+
+:::code language="json" source="~/quickstart-templates/101-analysis-services-create/azuredeploy.json":::
+
+A single [Microsoft.AnalysisServices/servers](https://docs.microsoft.com/azure/templates/microsoft.analysisservices/2017-08-01/servers) resource with a firewall rule is defined in the template. 
+
+### Deploy the template
+
+1. Select the following Deploy to Azure link to sign in to Azure and open a template. The template is used to create an Analysis Services server resource and specify required and optional properties.
+
+   <a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-analysis-services-create%2Fazuredeploy.json"><img src="./media/analysis-services-create-template/deploy-azure.png" alt="deploy to azure"/></a>
+
+2. Select or enter the following values.
+
+    Unless specified otherwise, use default values.
+
+    * **Subscription**: Select an Azure subscription.
+    * **Resource group**: Click **Create new**, and then enter a unique name for the new resource group.
+    * **Location**: Select a default location for resources created in the resource group.
+    * **Server Name**: Enter a name for the server resource. 
+    * **Location**: Ignore for Analysis Services. Location is specified in Server Location.
+    * **Server location**: Enter the location of the Analysis Services server. This is often the same region as the default Location specified for the Resource Group, but not required. For example **North Central US**. For supported regions, see [Analysis Services availability by region](analysis-services-overview.md#availability-by-region).
+    * **Sku Name**: Enter the sku name for the Analysis Services server to create. Choose from: B1, B2, D1, S0, S1, S2, S3, S4, S8v2, S9v2. Sku availability depends on region. S0 or D1 is recommended for evaluation and testing.
+    * **Capacity**: Enter the total number of query replica scale-out instances. Scale-out of more than one instance is supported in select regions only.
+    * **Firewall Settings**: Enter inbound firewall rules to define for the server. If not specified, firewall is disabled.
+    * **Backup Blob Container Uri**: Enter the SAS URI to a private Azure Blob Storage container with read, write and list permissions. Required only if you intend to use [Backup/restore](analysis-services-backup.md).
+    * **I agree to the terms and conditions state above**: Select.
+
+3. Select **Purchase**. After the server has been deployed successfully, you get a notification:
+
+   ![Resource Manager template, deploy portal notification](./media/analysis-services-create-template/notification.png)
+
+## Validate the deployment
+
+Use the Azure portal or Azure PowerShell to verify the resource group and server resource was created.
+
+#### PowerShell
+
+```azurepowershell-interactive
+$resourceGroupName = Read-Host -Prompt "Enter the Resource Group name"
+(Get-AzResource -ResourceType "Microsoft.AnalysisServices/servers" -ResourceGroupName $resourceGroupName).Name
+ Write-Host "Press [ENTER] to continue..."
+```
+
+---
+
+## Clean up resources
+
+When no longer needed, use the Azure portal, Azure CLI, or Azure PowerShell to delete the resource group and the server resource.
+
+# [CLI](#tab/CLI)
+
+```azurecli-interactive
+echo "Enter the Resource Group name:" &&
+read resourceGroupName &&
+az group delete --name $resourceGroupName &&
+echo "Press [ENTER] to continue ..."
+```
+
+# [PowerShell](#tab/PowerShell)
+
+```azurepowershell-interactive
+$resourceGroupName = Read-Host -Prompt "Enter the Resource Group name"
+Remove-AzResourceGroup -Name $resourceGroupName
+Write-Host "Press [ENTER] to continue..."
+```
+
+## Next steps
+
+In this quickstart, you used an Azure Resource Manager template to create a new resource group and an Azure Analysis Services server resource. After you've create a server resource by using the template, consider the following:
+- [Quickstart: Create a server - PowerShell](analysis-services-create-powershell.md)
+- [Add a sample model from the portal](analysis-services-create-sample-model.md)
+- [Configure server administrator and user roles](tutorials/analysis-services-tutorial-roles.md)

articles/active-directory/saas-apps/media/envoy-tutorial/provisioning.png

@@ -3,7 +3,7 @@ title: Configure Azure AD authentication
 description: Learn how to configure Azure Active Directory authentication as an identity provider for your App Service or Azure Functions app.
 ms.assetid: 6ec6a46c-bce4-47aa-b8a3-e133baef22eb
 ms.topic: article
-ms.date: 09/03/2019
+ms.date: 04/14/2020
 ms.custom: seodec18, fasttrack-edit
 ---
 
@@ -14,8 +14,7 @@ ms.custom: seodec18, fasttrack-edit
 This article shows you how to configure Azure App Service or Azure Functions to use Azure Active Directory (Azure AD) as an authentication provider.
 
 > [!NOTE]
-> At this time, [Azure Active Directory v2.0](../active-directory/develop/v2-overview.md) (including [MSAL](../active-directory/develop/msal-overview.md)) is not supported for Azure App Service and Azure Functions. Please check back for updates.
->
+> The express settings flow sets up an AAD V1 application registration. If you wish to use [Azure Active Directory v2.0](../active-directory/develop/v2-overview.md) (including [MSAL](../active-directory/develop/msal-overview.md)), please follow the [advanced configuration instructions](#advanced).
 
 Follow these best practices when setting up your app and authentication:
 
@@ -96,7 +95,7 @@ Perform the following steps:
     |Field|Description|
     |-|-|
     |Client ID| Use the **Application (client) ID** of the app registration. |
-    |Issuer Url| Use `https://login.microsoftonline.com/<tenant-id>`, and replace *\<tenant-id>* with the **Directory (tenant) ID** of the app registration. This value is used to redirect users to the correct Azure AD tenant, as well as to download the appropriate metadata to determine the appropriate token signing keys and token issuer claim value for example. |
+    |Issuer Url| Use `https://login.microsoftonline.com/<tenant-id>/v2.0`, and replace *\<tenant-id>* with the **Directory (tenant) ID** of the app registration. This value is used to redirect users to the correct Azure AD tenant, as well as to download the appropriate metadata to determine the appropriate token signing keys and token issuer claim value for example. The `/v2.0` section may be omitted for applications using AAD v1. |
     |Client Secret (Optional)| Use the client secret you generated in the app registration.|
     |Allowed Token Audiences| If this is a cloud or server app and you want to allow authentication tokens from a web app, add the **Application ID URI** of the web app here. The configured **Client ID** is *always* implicitly considered to be an allowed audience. |