Skip to content

Commit eddfa39

Browse files
committed
Merge branch 'main' into release-ga-lbcd
2 parents afec18e + 9320c98 commit eddfa39

File tree

89 files changed

+1534
-759
lines changed

Some content is hidden

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

89 files changed

+1534
-759
lines changed

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kengaderdus
55
manager: CelesteDG
66
ms.service: azure-active-directory
77
ms.topic: reference
8-
ms.date: 05/20/2025
8+
ms.date: 06/10/2025
99
ms.author: kengaderdus
1010
ms.subservice: b2c
1111
ms.custom: fasttrack-edit
@@ -87,33 +87,6 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
8787

8888
After you complete these steps for an Azure AD B2C tenant, your Azure subscription is billed based on your Azure Direct or Enterprise Agreement details, if applicable.
8989

90-
91-
<a name='change-your-azure-ad-pricing-tier'></a>
92-
93-
## Change your Microsoft Entra pricing tier
94-
95-
A tenant must be linked to the appropriate Azure pricing tier based on the features you want to use with your Azure AD B2C tenant. Premium features require Azure AD B2C Premium P1 or P2, as described in the [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
96-
97-
In some cases, you'll need to upgrade your pricing tier as you use new features. For example, if you want to use [Identity Protection](conditional-access-identity-protection-overview.md), risk-based Conditional Access policies, and any future Premium P2 capabilities with Azure AD B2C.
98-
99-
To change your pricing tier, follow these steps:
100-
101-
1. Sign in to the [Azure portal](https://portal.azure.com/).
102-
103-
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra ID tenant from the **Directories + subscriptions** menu.
104-
105-
1. In the search box at the top of the portal, enter the name of your Azure AD B2C tenant. Then select the tenant in the search results under **Resources**.
106-
107-
![Screenshot that shows how to select an Azure AD B2C tenant in Azure portal.](media/billing/select-azure-ad-b2c-tenant.png)
108-
109-
1. On the resource **Overview** page, under **Pricing tier**, select **change**.
110-
111-
![Screenshot that shows how to change the pricing tier.](media/billing/change-pricing-tier.png)
112-
113-
1. Select the pricing tier that includes the features you want to enable.
114-
115-
![Screenshot that shows how to select the pricing tier.](media/billing/select-tier.png)
116-
11790
Learn about the [Microsoft Entra ID features, which are supported in Azure AD B2C](supported-azure-ad-features.md).
11891

11992

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how Identity Protection gives you visibility into risky sign-
44
ms.service: azure-active-directory
55
ms.subservice: b2c
66
ms.topic: overview
7-
ms.date: 05/20/2025
7+
ms.date: 06/12/2025
88
ms.author: kengaderdus
99
author: kengaderdus
1010
manager: mwongerapk
@@ -24,7 +24,7 @@ If you're already familiar with [Identity Protection](../active-directory/identi
2424
![Conditional Access in a B2C tenant](media/conditional-access-identity-protection-overview/conditional-access-b2c.png)
2525

2626
> [!NOTE]
27-
> Azure AD B2C **Premium P2** is required to create risky sign-in policies. **Premium P1** tenants can create a policy that is based on location, application, user-based, or group-based policies. For more information, see [Change your Azure AD B2C pricing tier](billing.md#change-your-azure-ad-pricing-tier).
27+
> Azure AD B2C **Premium P2** is required to create risky sign-in policies but it has now been deprecated as of May 1, 2025.. **Premium P1** tenants can create a policy that is based on location, application, user-based, or group-based policies.
2828
2929
## Benefits of Identity Protection and Conditional Access for Azure AD B2C
3030

articles/active-directory-b2c/conditional-access-user-flow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to add Conditional Access to Azure AD B2C user flows. Con
55
ms.service: azure-active-directory
66
ms.subservice: b2c
77
ms.topic: overview
8-
ms.date: 02/18/2025
8+
ms.date: 06/12/2025
99
ms.author: kengaderdus
1010
author: kengaderdus
1111
manager: CelesteDG
@@ -86,7 +86,7 @@ When using the Microsoft Entra Conditional Access, consider the following:
8686

8787
## Pricing tier
8888

89-
Azure AD B2C **Premium P2** is required to create risky sign-in policies. **Premium P1** tenants can create a policy that is based on location, application, user-based, or group-based policies. For more information, see [Change your Azure AD B2C pricing tier](billing.md#change-your-azure-ad-pricing-tier)
89+
Azure AD B2C **Premium P2** is required to create risky sign-in policies but it has now been deprecated as of May 1, 2025. **Premium P1** tenants can create a policy that is based on location, application, user-based, or group-based policies.
9090

9191
## Prepare your Azure AD B2C tenant
9292

@@ -438,4 +438,4 @@ To review the result of a Conditional Access event:
438438

439439
## Related content
440440

441-
[Customize the user interface in an Azure AD B2C user flow](customize-ui-with-html.md)
441+
[Customize the user interface in an Azure AD B2C user flow](customize-ui-with-html.md)

articles/active-directory-b2c/faq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
ms.service: azure-active-directory
99

1010
ms.topic: faq
11-
ms.date: 10/01/2024
11+
ms.date: 06/12/2024
1212
ms.author: godonnell
1313
ms.subservice: b2c
1414
ms.custom: b2c-support, has-azure-ad-ps-ref,azure-ad-ref-level-one-done
@@ -269,7 +269,7 @@ sections:
269269
- question: |
270270
Can I purchase Microsoft Entra ID P1 and Microsoft Entra ID P2 licensing for my Azure AD B2C tenant?
271271
answer: |
272-
No, Azure AD B2C tenants don't use Microsoft Entra ID P1 or Microsoft Entra ID P2 licensing. Azure AD B2C uses [Azure AD B2C Premium P1 or P2](billing.md#change-your-azure-ad-pricing-tier) licenses, which are different from Microsoft Entra ID P1 or P2 licenses for a Standard Microsoft Entra tenant. Azure AD B2C tenants natively support some features that are similar to Microsoft Entra ID P1 or P2 features, as explained in [Supported Microsoft Entra ID features](supported-azure-ad-features.md).
272+
No, Azure AD B2C tenants don't use Microsoft Entra ID P1 or Microsoft Entra ID P2 licensing. Azure AD B2C uses Premium P1 or P2 licenses, which are no longer available for purchase as of May 1, 2025. They are different from Microsoft Entra ID P1 or P2 licenses for a Standard Microsoft Entra tenant. Azure AD B2C tenants natively support some features that are similar to Microsoft Entra ID P1 or P2 features, as explained in [Supported Microsoft Entra ID features](supported-azure-ad-features.md).
273273
274274
- question: |
275275
Can I use a group-based assignment for Microsoft Entra Enterprise Applications in my Azure AD B2C tenant?

articles/active-directory-b2c/page-layout.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: reference
12-
ms.date: 02/27/2025
12+
ms.date: 06/12/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515

@@ -65,6 +65,9 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
6565

6666
## Self-asserted page (selfasserted)
6767

68+
**2.1.35**
69+
- Enhanced CAPTCHA error handling now ensures that any validation failures—such as “unmatched challenge”—returned by the backend are consistently captured and displayed in the UI.
70+
6871
**2.1.34**
6972
- Input labels are now consistently visible and accessible, enhancing user experience and clarity. A new `enableInputLabel` feature flag has been introduced, which is enabled by default, allowing clients to toggle the visibility of input labels according to their preferences.
7073
- Resolved a problem with CAPTCHA input boxes to ensure smoother and more accurate interactions for Finnish language users.
@@ -224,6 +227,9 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
224227
> [!TIP]
225228
> If you localize your page to support multiple locales, or languages in a user flow. The [localization IDs](localization-string-ids.md) article provides the list of localization IDs that you can use for the page version you select.
226229
230+
**2.1.23**
231+
- Enhanced CAPTCHA error handling now ensures that any validation failures—such as “unmatched challenge”—returned by the backend are consistently captured and displayed in the UI.
232+
227233
**2.1.22**
228234
- Input labels are now consistently visible and accessible, enhancing user experience and clarity. A new `enableInputLabel` feature flag has been introduced, which is enabled by default, allowing clients to toggle the visibility of input labels according to their preferences.
229235
- Resolved a problem with CAPTCHA input boxes to ensure smoother and more accurate interactions for Finnish language users.
@@ -324,6 +330,9 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
324330

325331
## MFA page (multifactor)
326332

333+
**1.2.21**
334+
- Enhanced CAPTCHA error handling now ensures that any validation failures—such as “unmatched challenge”—returned by the backend are consistently captured and displayed in the UI.
335+
327336
**1.2.20**
328337
- Resolved a problem with CAPTCHA input boxes to ensure smoother and more accurate interactions for Finnish language users.
329338

articles/app-service/environment/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
- name: Resources
5353
items:
5454
- name: Azure Roadmap
55-
href: https://azure.microsoft.com/roadmap/
55+
href: https://azure.microsoft.com/updates/
5656
- name: Pricing
5757
href: https://azure.microsoft.com/pricing/details/app-service/
5858
- name: Quota Information

articles/app-service/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ landingContent:
7171
url: tutorial-ai-openai-chatbot-java.md
7272
- text: Run a chatbot with a local SLM (Express.js)
7373
url: tutorial-ai-slm-expressjs.md
74-
- text: Invoke OpenAPI web app from Azure AI Agent
74+
- text: Invoke a web app from Azure AI Agent
7575
url: invoke-openapi-web-app-from-azure-ai-agent-service.md
7676

7777
- title: Secure and deploy

articles/app-service/invoke-openapi-web-app-from-azure-ai-agent-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Invoke an OpenAPI App Service web app from Azure AI Foundry Agent Service'
2+
title: 'Invoke an App Service web app from Azure AI Foundry Agent Service'
33
description: Learn how to integrate App Service with AI Foundry Agent Service and get started with agentic AI
44
author: seligj95
55
ms.author: jordanselig
@@ -11,7 +11,7 @@ ms.custom:
1111
ms.collection: ce-skilling-ai-copilot
1212
---
1313

14-
# Invoke an OpenAPI App Service web app from Azure AI Foundry Agent Service
14+
# Invoke an App Service web app from Azure AI Foundry Agent Service
1515

1616
[Azure AI Foundry Agent Service](/azure/ai-services/agents/overview) allows you to create AI agents tailored to your needs through custom instructions and augmented by advanced tools like code interpreter, and custom functions. You can now connect your Azure AI Agent to an external API using an [OpenAPI 3.0](https://www.openapis.org/what-is-openapi) specified tool, allowing for scalable interoperability with various applications.
1717

articles/app-service/networking-features.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Networking features
33
description: Learn about the networking features in Azure App Service, and learn which features you need for security or other functionality.
4-
author: madsd
4+
author: seligj95
55
ms.assetid: 5c61eed1-1ad1-4191-9f71-906d610ee5b7
66
ms.topic: article
7-
ms.date: 01/30/2025
8-
ms.author: madsd
7+
ms.date: 06/13/2025
8+
ms.author: jordanselig
99
ms.custom: UpdateFrequency3
1010
#customer intent: As a deployment engineer, I want to understand the options for deploying apps in Azure App Services to control network traffic.
1111
---
@@ -15,7 +15,7 @@ You can deploy applications in Azure App Service in multiple ways. By default, a
1515

1616
There are two main deployment types for Azure App Service:
1717

18-
- The multitenant public service hosts App Service plans in the Free, Shared, Basic, Standard, Premium, PremiumV2, and PremiumV3 pricing SKUs.
18+
- The multitenant public service hosts App Service plans in the Free, Shared, Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 pricing SKUs.
1919
- The single-tenant App Service Environment (ASE) hosts Isolated SKU App Service plans directly in your Azure virtual network.
2020

2121
The features that you use depend on whether you're in the multitenant service or in an ASE.
@@ -71,12 +71,15 @@ Azure App Service scale units support many customers in each deployment. The Fre
7171

7272
#### Outbound addresses
7373

74-
The worker virtual machines are broken down in large part by the App Service plans. The Free, Shared, Basic, Standard, and Premium plans all use the same worker virtual machine type. The PremiumV2 plan uses another virtual machine type. PremiumV3 uses yet another virtual machine type.
74+
The worker virtual machines are broken down in large part by the App Service plans. The Free, Shared, Basic, Standard, and Premium plans all use the same worker virtual machine type. The PremiumV2 plan uses another virtual machine type. PremiumV3 uses yet another virtual machine type. And PremiumV4 uses yet another virtual machine type.
7575

7676
When you change the virtual machine family, you get a different set of outbound addresses. If you scale from Standard to PremiumV2, your outbound addresses change. If you scale from PremiumV2 to PremiumV3, your outbound addresses change. In some older scale units, both the inbound and outbound addresses change when you scale from Standard to PremiumV2.
7777

7878
There are many addresses that are used for outbound calls. The outbound addresses used by your app for making outbound calls are listed in the properties for your app. All the apps that run on the same worker virtual machine family in the App Service deployment share these addresses. If you want to see all the addresses that your app might use in a scale unit, there's property called `possibleOutboundAddresses` that lists them.
7979

80+
> [!NOTE]
81+
> Apps on the PremiumV4 SKU don't expose their outbound IP addresses.
82+
8083
:::image type="content" source="media/networking-features/app-properties.png" alt-text="Screenshot that shows app properties, including possible outbound addresses." lightbox="media/networking-features/app-properties.png":::
8184

8285
App Service has many endpoints that are used to manage the service. Those addresses are published in a separate document and are also in the `AppServiceManagement` IP service tag. The `AppServiceManagement` tag is used only in App Service Environments where you need to allow such traffic. The App Service inbound addresses are tracked in the `AppService` IP service tag. There's no IP service tag that contains the outbound addresses used by App Service.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: cephalin
55
ms.author: cephalin
66
ms.service: azure-app-service
77
ms.topic: overview
8-
ms.date: 06/06/2025
8+
ms.date: 06/12/2025
99
ms.custom:
1010
- build-2025
1111
---
@@ -31,7 +31,7 @@ Build AI-powered .NET applications with these tutorials:
3131
- [Build a RAG application with Azure OpenAI and Azure AI Search (.NET)](tutorial-ai-openai-search-dotnet.md) - Implement RAG to enable your AI models to access and use your organization's data.
3232
- [Build a RAG application with Azure OpenAI and Azure SQL](deploy-intelligent-apps-dotnet-to-azure-sql.md) - Use Azure SQL as a vector database for RAG applications.
3333
- [Run a chatbot with a local SLM sidecar extension](tutorial-ai-slm-dotnet.md) - Deploy a chatbot that uses a local SLM without requiring an external AI service.
34-
- [Invoke OpenAPI web app from Azure AI Agent](invoke-openapi-web-app-from-azure-ai-agent-service.md) - Make your web API available to AI agents.
34+
- [Invoke a web app from Azure AI Foundry Agent](invoke-openapi-web-app-from-azure-ai-agent-service.md) - Make your web API available to AI agents.
3535

3636
## Java applications
3737

0 commit comments

Comments
 (0)