Skip to content

Commit 4e990b0

Browse files
Merge branch 'main' into patch-1
2 parents 1948b5f + 2e6f599 commit 4e990b0

File tree

5,253 files changed

+92251
-59344
lines changed

Some content is hidden

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

5,253 files changed

+92251
-59344
lines changed

.gitignore

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,23 @@ AzureMigration.ps1
2626
*.pdn
2727

2828
# Pycharm
29-
.idea/*
29+
.idea/*
30+
articles/planetary-computer/doc-tree-generator.py
31+
.gitignore
32+
articles/planetary-computer/article_links_diagram.md
33+
articles/planetary-computer/index_helper.py
34+
articles/planetary-computer/metadata_index.csv
35+
articles/planetary-computer/broken_link_checker.py
36+
articles/planetary-computer/broken_links_external.csv
37+
articles/planetary-computer/broken_links.csv
38+
articles/planetary-computer/check_orphaned_docs.py
39+
40+
# Python cache files
41+
*.pyc
42+
__pycache__/
43+
articles/planetary-computer/interesting_stats.py
44+
articles/planetary-computer/locate_text.py
45+
articles/planetary-computer/image_syntax_checker.py
46+
articles/planetary-computer/image-file-fixer.py
47+
articles/planetary-computer/orphaned-media.py
48+
articles/planetary-computer/orphaned_media_files.txt

.openpublishing.publish.config.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,30 @@
140140
"branch": "main",
141141
"branch_mapping": {}
142142
},
143+
{
144+
"path_to_root": "remote-mcp-functions-dotnet",
145+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-dotnet",
146+
"branch": "main",
147+
"branch_mapping": {}
148+
},
149+
{
150+
"path_to_root": "remote-mcp-functions-typescript",
151+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-typescript",
152+
"branch": "main",
153+
"branch_mapping": {}
154+
},
155+
{
156+
"path_to_root": "remote-mcp-functions-python",
157+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-python",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
161+
{
162+
"path_to_root": "remote-mcp-functions-java",
163+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-java",
164+
"branch": "main",
165+
"branch_mapping": {}
166+
},
143167
{
144168
"path_to_root": "azure-functions-durable-js",
145169
"url": "https://github.com/Azure/azure-functions-durable-js",
@@ -158,6 +182,12 @@
158182
"branch": "dev",
159183
"branch_mapping": {}
160184
},
185+
{
186+
"path_to_root": "azure-functions-mongodb-extension",
187+
"url": "https://github.com/Azure/Azure-functions-mongodb-extension",
188+
"branch": "main",
189+
"branch_mapping": {}
190+
},
161191
{
162192
"path_to_root": "azure-functions-nodejs-v4",
163193
"url": "https://github.com/Azure/azure-functions-nodejs-samples",

.openpublishing.redirection.json

Lines changed: 142 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,95 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/cdn/cdn-traffic-manager.md",
5+
"redirect_url": "/previous-versions/azure/cdn/cdn-traffic-manager",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/frontdoor/quickstart-create-front-door.md",
10+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/frontdoor/quickstart-create-front-door-terraform.md",
15+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-terraform",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/frontdoor/quickstart-create-front-door-template.md",
20+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-template",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/frontdoor/quickstart-create-front-door-powershell.md",
25+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/frontdoor/quickstart-create-front-door-cli.md",
30+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-cli",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/frontdoor/quickstart-create-front-door-bicep.md",
35+
"redirect_url": "/previous-versions/azure/frontdoor/quickstart-create-front-door-bicep",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/cloud-services/cloud-services-application-and-service-availability-faq.yml",
40+
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-application-and-service-availability-faq",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/cloud-services/cloud-services-configuration-and-management-faq.yml",
45+
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-configuration-and-management-faq",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/cloud-services/cloud-services-connectivity-and-networking-faq.yml",
50+
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-connectivity-and-networking-faq",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/cloud-services/cloud-services-deployment-faq.yml",
55+
"redirect_url": "/previous-versions/azure/cloud-services/cloud-services-deployment-faq",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/cloud-services/index.yml",
60+
"redirect_url": "/previous-versions/azure/cloud-services/index",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/private-multi-access-edge-compute-mec/index.yml",
65+
"redirect_url": "/previous-versions/azure/private-multi-access-edge-compute-mec/index",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/site-recovery/shared-disks-common-questions.md",
70+
"redirect_url": "/azure/site-recovery/azure-to-azure-common-questions",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/network-watcher/traffic-analytics-schema-update.md",
75+
"redirect_url": "/previous-versions/azure/network-watcher/traffic-analytics-schema-update",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools.md",
80+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/network-watcher/network-watcher-nsg-grafana.md",
85+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-nsg-grafana",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/network-watcher/network-watcher-analyze-nsg-flow-logs-graylog.md",
90+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-analyze-nsg-flow-logs-graylog",
91+
"redirect_document_id": false
92+
},
393
{
494
"source_path": "articles/api-management/migrate-stv1-to-stv2-no-vnet.md",
595
"redirect_url": "/previous-versions/azure/api-management/migrate-stv1-to-stv2-no-vnet",
@@ -474,6 +564,11 @@
474564
"redirect_url": "/azure/security/fundamentals/azure-CA-details",
475565
"redirect_document_id": false
476566
},
567+
{
568+
"source_path": "articles/security/fundamentals/recover-from-identity-compromise.md",
569+
"redirect_url": "/azure/security/fundamentals/ransomware-detect-respond#road-to-recovery",
570+
"redirect_document_id": false
571+
},
477572
{
478573
"source_path": "articles/event-grid/event-schema-storage-actions.md",
479574
"redirect_url": "/azure/storage-actions/overview",
@@ -2394,6 +2489,11 @@
23942489
"redirect_url": "/azure/architecture/web-apps/guides/multi-region-app-service/multi-region-app-service",
23952490
"redirect_document_id": false
23962491
},
2492+
{
2493+
"source_path_from_root": "/articles/app-service/app-service-configure-premium-tier.md",
2494+
"redirect_url": "/azure/app-service/app-service-configure-premium-v4-tier",
2495+
"redirect_document_id": false
2496+
},
23972497
{
23982498
"source_path_from_root": "/articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
23992499
"redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
@@ -6851,7 +6951,27 @@
68516951
},
68526952
{
68536953
"source_path_from_root": "/articles/azure-functions/migration.md",
6854-
"redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
6954+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6955+
"redirect_document_id": false
6956+
},
6957+
{
6958+
"source_path": "articles/azure-functions/migration/migrate-lambda-workloads-overview.md",
6959+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6960+
"redirect_document_id": false
6961+
},
6962+
{
6963+
"source_path": "articles/azure-functions/migration/discover-lambda-workloads.md",
6964+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6965+
"redirect_document_id": false
6966+
},
6967+
{
6968+
"source_path": "articles/azure-functions/migration/assess-lambda-workloads.md",
6969+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
6970+
"redirect_document_id": false
6971+
},
6972+
{
6973+
"source_path": "articles/azure-functions/migration/migrate-lambda-workloads.md",
6974+
"redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
68556975
"redirect_document_id": false
68566976
},
68576977
{
@@ -6918,6 +7038,26 @@
69187038
"source_path": "articles/defender-for-iot/organizations/eiot-sensor.md",
69197039
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
69207040
"redirect_document_id": false
7041+
},
7042+
{
7043+
"source_path": "articles/cyclecloud/release-notes/ccws/2024.09.18.md",
7044+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2024-09-18",
7045+
"redirect_document_id": false
7046+
},
7047+
{
7048+
"source_path": "articles/cyclecloud/release-notes/ccws/2024.11.08.md",
7049+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2024-11-08",
7050+
"redirect_document_id": false
7051+
},
7052+
{
7053+
"source_path": "articles/cyclecloud/release-notes/ccws/2024.12.18.md",
7054+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2024-12-18",
7055+
"redirect_document_id": false
7056+
},
7057+
{
7058+
"source_path": "articles/cyclecloud/release-notes/ccws/2025.02.06.md",
7059+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
7060+
"redirect_document_id": false
69217061
}
69227062
]
6923-
}
7063+
}

articles/active-directory-b2c/api-connectors-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
8787
![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
8888

8989
> [!NOTE]
90-
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
90+
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds for custom policies and 5 seconds for user flows. The default retry count is one (meaning there are 2 tries in total).
9191
9292
## Calling a RESTful service
9393

articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ A successful token response looks like this:
233233
| access_token |The signed JWT that you requested. |
234234
| scope |The scopes that the token is valid for. You also can use the scopes to cache tokens for later use. |
235235
| expires_in |The length of time that the token is valid (in seconds). |
236-
| refresh_token |An OAuth 2.0 refresh token. The app can use this token to acquire additional tokens after the current token expires. Refresh tokens are long-lived, and can be used to retain access to resources for extended periods of time. For more information, see the [Azure AD B2C token reference](tokens-overview.md). |
236+
| refresh_token |An OAuth 2.0 refresh token. The app can use this token to acquire additional tokens after the current token expires. Refresh tokens are long-lived and can be used to retain access to resources for extended periods of time. For more information, see the [Azure AD B2C token reference](tokens-overview.md). |
237237

238238
Error responses look like this:
239239

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 40 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: 03/10/2025
8+
ms.date: 06/10/2025
99
ms.author: kengaderdus
1010
ms.subservice: b2c
1111
ms.custom: fasttrack-edit
@@ -36,18 +36,6 @@ Also, if you choose to provide higher levels of assurance by using multifactor a
3636
> [!IMPORTANT]
3737
> This article does not contain pricing details. For the latest information about usage billing and pricing, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/). See also [Azure AD B2C region availability and data residency](data-residency.md) for details about where the Azure AD B2C service is available and where user data is stored.
3838
39-
## What do I need to do?
40-
41-
To take advantage of MAU billing, your Azure AD B2C tenant must be linked to an Azure subscription. You might also need to switch your Azure AD B2C tenant to another pricing tier if you want to use Azure AD B2C Premium P2 features, like risk-based Conditional Access policies.
42-
43-
|If your tenant is: |You need to: |
44-
|---------|---------|
45-
| An Azure AD B2C tenant already billed on a per-MAU basis | Do nothing. When users authenticate to your Azure AD B2C tenant, you'll be automatically billed using the MAU-based billing model. |
46-
| An Azure AD B2C tenant not yet linked to a subscription | [Link your Azure AD B2C tenant to a subscription](#link-an-azure-ad-b2c-tenant-to-a-subscription) to activate MAU billing. |
47-
| An Azure AD B2C tenant that was linked to a subscription before November 1, 2019 | [Switch to MAU billing (recommended)](#switch-to-mau-billing-pre-november-2019-azure-ad-b2c-tenants), or stay on the per-authentication billing model. |
48-
| An Azure AD B2C tenant and you want to use premium features (like risk-based Conditional Access policies) | [Change to a Microsoft Entra pricing tier](#change-your-azure-ad-pricing-tier) that supports the features you want to use. |
49-
| | |
50-
5139
## About the monthly active users (MAU) billing model
5240

5341
MAU billing went into effect for Azure AD B2C tenants on **November 1, 2019**. Any Azure AD B2C tenants that you created and linked to a subscription on or after that date have been billed on a per-MAU basis.
@@ -99,33 +87,6 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
9987

10088
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.
10189

102-
103-
<a name='change-your-azure-ad-pricing-tier'></a>
104-
105-
## Change your Microsoft Entra pricing tier
106-
107-
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/).
108-
109-
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.
110-
111-
To change your pricing tier, follow these steps:
112-
113-
1. Sign in to the [Azure portal](https://portal.azure.com/).
114-
115-
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.
116-
117-
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**.
118-
119-
![Screenshot that shows how to select an Azure AD B2C tenant in Azure portal.](media/billing/select-azure-ad-b2c-tenant.png)
120-
121-
1. On the resource **Overview** page, under **Pricing tier**, select **change**.
122-
123-
![Screenshot that shows how to change the pricing tier.](media/billing/change-pricing-tier.png)
124-
125-
1. Select the pricing tier that includes the features you want to enable.
126-
127-
![Screenshot that shows how to select the pricing tier.](media/billing/select-tier.png)
128-
12990
Learn about the [Microsoft Entra ID features, which are supported in Azure AD B2C](supported-azure-ad-features.md).
13091

13192

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ 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: 01/11/2024
7+
ms.date: 06/12/2025
88
ms.author: kengaderdus
99
author: kengaderdus
10-
manager: CelesteDG
10+
manager: mwongerapk
1111
ms.collection: M365-identity-device-management
1212

1313
#Customer intent: As an Azure AD B2C application owner, I want to enhance the security of my applications by using Identity Protection and Conditional Access, so that I can detect and respond to risky authentications and enforce organizational policies.
@@ -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/custom-policies-series-call-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ to:
216216
```xml
217217
<ValidationTechnicalProfile ReferenceId="ValidateAccessCodeViaHttp"/>
218218
```
219-
At this point, the Technical Profile with `Id` *CheckAccessCodeViaClaimsTransformationChecker* isn't needed, and can be removed.
219+
At this point, the Technical Profile with `Id` *CheckAccessCodeViaClaimsTransformationChecker* isn't needed and can be removed.
220220

221221

222222
## Step 3 - Upload custom policy file

articles/active-directory-b2c/external-identities-videos.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ms.subservice: b2c
1515
---
1616

1717
# Microsoft Azure Active Directory B2C external identity video series
18+
1819
[!INCLUDE [active-directory-b2c-end-of-sale-notice-b](../../includes/active-directory-b2c-end-of-sale-notice-b.md)]
1920

2021
Learn the basics of External Identities - Azure Active Directory B2C (Azure AD B2C) and Microsoft Entra B2B in the Microsoft identity platform.

0 commit comments

Comments
 (0)