Skip to content

Commit c699cd6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into lb-basic-overview
2 parents 3134971 + 735796b commit c699cd6

File tree

78 files changed

+823
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+823
-232
lines changed

articles/active-directory-b2c/find-help-open-support-ticket.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,13 @@ If you're unable to find answers by using self-help resources, you can open an o
7575

7676
1. Select a **[Severity](https://azure.microsoft.com/support/plans/response)**, and your preferred contact method.
7777

78+
> [!NOTE]
79+
> Under **Advanced diagnostic information**, it's highly recommended that you allow the collection of advanced information by selecting **Yes**. It enables Microsoft support team to investigate the issue faster.
7880
7981
:::image type="content" source="media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-1.png" alt-text="Screenshot of how to find help and submit support ticket part 1.":::
8082

8183
:::image type="content" source="media/find-help-and-submit-support-ticket/find-help-and-submit-support-ticket-2.png" alt-text="Screenshot of how to find help and submit support ticket part 2.":::
84+
8285

8386
1. Select **Next**. Under **4. Review + create**, you'll see a summary of your support ticket.
8487

articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: active-directory
77
ms.subservice: app-provisioning
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 02/16/2022
10+
ms.date: 04/13/2022
1111
ms.author: kenwith
1212
ms.reviewer: arvinh
1313
---
@@ -1237,6 +1237,18 @@ Generate a user alias by taking first three letters of user's first name and fir
12371237
* **INPUT** (surname): "Doe"
12381238
* **OUTPUT**: "JohDoe"
12391239

1240+
### Add a comma between last name and first name.
1241+
Add a comma between last name and first name.
1242+
1243+
**Expression:**
1244+
`Join(", ", "", [surname], [givenName])`
1245+
1246+
**Sample input/output:**
1247+
1248+
* **INPUT** (givenName): "John"
1249+
* **INPUT** (surname): "Doe"
1250+
* **OUTPUT**: "Doe, John"
1251+
12401252

12411253
## Related Articles
12421254
* [Automate User Provisioning/Deprovisioning to SaaS Apps](../app-provisioning/user-provisioning.md)

articles/active-directory/app-provisioning/on-premises-application-provisioning-architecture.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: billmath
1313
ms.collection: M365-identity-device-management
1414
---
1515

16-
# Azure AD on-premises application provisioning architecture (preview)
16+
# Azure AD on-premises application identity provisioning architecture (preview)
1717

1818
## Overview
1919

@@ -134,19 +134,19 @@ You can also check whether all the required ports are open.
134134
- Microsoft Azure AD Connect Agent Updater
135135
- Microsoft Azure AD Connect Provisioning Agent Package
136136

137-
### Provisioning agent history
137+
## Provisioning agent history
138138
This article lists the versions and features of Azure Active Directory Connect Provisioning Agent that have been released. The Azure AD team regularly updates the Provisioning Agent with new features and functionality. Please ensure that you do not use the same agent for on-prem provisioning and Cloud Sync / HR-driven provisioning.
139139

140140
Microsoft provides direct support for the latest agent version and one version before.
141141

142-
## Download link
142+
### Download link
143143
You can download the latest version of the agent using [this link](https://aka.ms/onpremprovisioningagent).
144144

145-
## 1.1.846.0
145+
### 1.1.846.0
146146

147147
April 11th, 2022 - released for download
148148

149-
### Fixed issues
149+
#### Fixed issues
150150

151151
- We added support for ObjectGUID as an anchor for the generic LDAP connector when provisioning users into AD LDS.
152152

articles/app-service/includes/tutorial-dotnetcore-sqldb-app/visual-studio-code-deploy-app-service-02.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@ ms.topic: include
55
ms.date: 02/03/2022
66
---
77

8-
1. Select the Azure icon on the left navigation and expand the subscriptions to find the **coreSqlXYZ** App Service you created previously.
8+
1. In the Visual Studio Code terminal, run the .NET CLI command below. This command generates a deployable `publish` folder for the app in the `bin/release/publish` directory.
99

10-
1. Right-click on the **App Service** node and select **Deploy to Web App**.
10+
```dotnetcli
11+
dotnet publish -c Release
12+
```
1113
12-
1. A prompt will appear to select the folder to deploy. If root of the project is already suggested, choose that option, otherwise select the **Browse** button to select the root folder from the file explorer.
14+
1. Right-click on the generated `publish` folder in the Visual Studio Code explorer and select **Deploy to Web App**.
1315
14-
When the deployment completes, you should see a VS Code notification prompting you to browse to the deployed app.
16+
1. A new workflow will open in the command palette at the top of the screen. Select the subscription you would like to publish your app to.
17+
18+
1. Select the App Service web app you created earlier.
19+
20+
If Visual Studio Code prompts you to confirm, click **deploy**. The deployment process may take a few moments. When the process completes, a notification should appear in the bottom right corner prompting you to browse to the deployed app.
12.7 KB
Loading
10.8 KB
Loading
8.59 KB
Loading
13.8 KB
Loading

articles/app-service/networking/nat-gateway-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.assetid: 0a84734e-b5c1-4264-8d1f-77e781b28426
88
ms.service: app-service
99
ms.workload: web
1010
ms.topic: article
11-
ms.date: 08/04/2021
11+
ms.date: 04/08/2022
1212
ms.author: madsd
1313
ms.custom: seodec18, devx-track-azurecli
1414
ms.devlang: azurecli
@@ -26,7 +26,7 @@ For more information and pricing. Go to the [NAT gateway overview](../../virtual
2626
:::image type="content" source="./media/nat-gateway-integration/nat-gateway-overview.png" alt-text="Diagram shows Internet traffic flowing to a NAT gateway in an Azure Virtual Network.":::
2727

2828
> [!Note]
29-
> * Using NAT gateway with App Service is dependent on virtual network integration, and therefore **Standard**, **Premium**, **PremiumV2** or **PremiumV3** App Service plan is required.
29+
> * Using NAT gateway with App Service is dependent on virtual network integration, and therefore a supported App Service plan pricing tier is required.
3030
> * When using NAT gateway together with App Service, all traffic to Azure Storage must be using private endpoint or service endpoint.
3131
> * NAT gateway cannot be used together with App Service Environment v1 or v2.
3232

articles/app-service/overview-vnet-integration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Integrate your app with an Azure virtual network
33
description: Integrate your app in Azure App Service with Azure virtual networks.
44
author: madsd
55
ms.topic: conceptual
6-
ms.date: 03/04/2022
6+
ms.date: 04/08/2022
77
ms.author: madsd
88

99
---
@@ -158,7 +158,7 @@ After your app integrates with your virtual network, it uses the same DNS server
158158

159159
There are some limitations with using regional virtual network integration:
160160

161-
* The feature is available from all App Service deployments in Premium v2 and Premium v3. It's also available in Standard but only from newer App Service deployments. If you're on an older deployment, you can only use the feature from a Premium v2 App Service plan. If you want to make sure you can use the feature in a Standard App Service plan, create your app in a Premium v3 App Service plan. Those plans are only supported on our newest deployments. You can scale down if you want after the plan is created.
161+
* The feature is available from all App Service deployments in Premium v2 and Premium v3. It's also available in Basic and Standard tier but only from newer App Service deployments. If you're on an older deployment, you can only use the feature from a Premium v2 App Service plan. If you want to make sure you can use the feature in a Standard App Service plan, create your app in a Premium v3 App Service plan. Those plans are only supported on our newest deployments. You can scale down if you want after the plan is created.
162162
* The feature can't be used by Isolated plan apps that are in an App Service Environment.
163163
* You can't reach resources across peering connections with classic virtual networks.
164164
* The feature requires an unused subnet that's an IPv4 `/28` block or larger in an Azure Resource Manager virtual network.
@@ -257,7 +257,7 @@ The regional virtual network integration feature has no extra charge for use bey
257257

258258
Three charges are related to the use of the gateway-required virtual network integration feature:
259259

260-
* **App Service plan pricing tier charges**: Your apps need to be in a Standard, Premium, Premium v2, or Premium v3 App Service plan. For more information on those costs, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
260+
* **App Service plan pricing tier charges**: Your apps need to be in a Basic, Standard, Premium, Premium v2, or Premium v3 App Service plan. For more information on those costs, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
261261
* **Data transfer costs**: There's a charge for data egress, even if the virtual network is in the same datacenter. Those charges are described in [Data transfer pricing details](https://azure.microsoft.com/pricing/details/data-transfers/).
262262
* **VPN gateway costs**: There's a cost to the virtual network gateway that's required for the point-to-site VPN. For more information, see [VPN gateway pricing](https://azure.microsoft.com/pricing/details/vpn-gateway/).
263263

0 commit comments

Comments
 (0)