Skip to content

Commit 1e69d6b

Browse files
authored
Merge branch 'main' into lb-ga-updates
2 parents ae1bbc5 + 322cc41 commit 1e69d6b

File tree

2,674 files changed

+26830
-22037
lines changed

Some content is hidden

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

2,674 files changed

+26830
-22037
lines changed

.openpublishing.redirection.json

Lines changed: 21 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
5+
"redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
10+
"redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path": "articles/confidential-computing/virtual-machine-solutions.md",
515
"redirect_url": "/azure/virtual-machines/",
@@ -2010,21 +2020,6 @@
20102020
"redirect_url": "/azure/migrate/migrate-services-overview",
20112021
"redirect_document_id": false
20122022
},
2013-
{
2014-
"source_path_from_root": "/articles/monitoring/management-overview-monitoring.md",
2015-
"redirect_url": "/azure/monitoring/",
2016-
"redirect_document_id": false
2017-
},
2018-
{
2019-
"source_path_from_root": "/articles/monitoring/monitoring-container-health.md",
2020-
"redirect_url": "/azure/monitoring/monitoring-container-insights-overview",
2021-
"redirect_document_id": false
2022-
},
2023-
{
2024-
"source_path_from_root": "/articles/monitoring/monitoring-walkthrough-servicemap.md",
2025-
"redirect_url": "/azure/monitoring/monitoring-service-map",
2026-
"redirect_document_id": false
2027-
},
20282023
{
20292024
"source_path_from_root": "/articles/multi-factor-authentication/end-user/index.md",
20302025
"redirect_url": "/azure/multi-factor-authentication/end-user/multi-factor-authentication-end-user",
@@ -2210,101 +2205,6 @@
22102205
"redirect_url": "/azure/openshift/delete-cluster",
22112206
"redirect_document_id": false
22122207
},
2213-
{
2214-
"source_path_from_root": "/articles/operations-management-suite/index.md",
2215-
"redirect_url": "/azure/monitoring",
2216-
"redirect_document_id": false
2217-
},
2218-
{
2219-
"source_path_from_root": "/articles/operations-management-suite/oms-solution-agenthealth.md",
2220-
"redirect_url": "/azure/monitoring/monitoring-solution-agenthealth",
2221-
"redirect_document_id": false
2222-
},
2223-
{
2224-
"source_path_from_root": "/articles/operations-management-suite/oms-solution-office-365.md",
2225-
"redirect_url": "/azure/monitoring/monitoring-solution-office-365",
2226-
"redirect_document_id": false
2227-
},
2228-
{
2229-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-architecture.md",
2230-
"redirect_url": "/azure/monitoring",
2231-
"redirect_document_id": false
2232-
},
2233-
{
2234-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-integration.md",
2235-
"redirect_url": "/azure/monitoring",
2236-
"redirect_document_id": false
2237-
},
2238-
{
2239-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-overview.md",
2240-
"redirect_url": "/azure/monitoring",
2241-
"redirect_document_id": false
2242-
},
2243-
{
2244-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-runbook-datacollect.md",
2245-
"redirect_url": "/azure/monitoring/monitoring-runbook-datacollect",
2246-
"redirect_document_id": false
2247-
},
2248-
{
2249-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-sdk.md",
2250-
"redirect_url": "/azure/monitoring",
2251-
"redirect_document_id": false
2252-
},
2253-
{
2254-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-service-map-scom.md",
2255-
"redirect_url": "/azure/monitoring/monitoring-service-map-scom",
2256-
"redirect_document_id": false
2257-
},
2258-
{
2259-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-service-map.md",
2260-
"redirect_url": "/azure/monitoring/monitoring-service-map",
2261-
"redirect_document_id": false
2262-
},
2263-
{
2264-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solution-targeting.md",
2265-
"redirect_url": "/azure/monitoring/monitoring-solution-targeting",
2266-
"redirect_document_id": false
2267-
},
2268-
{
2269-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-best-practices.md",
2270-
"redirect_url": "/azure/monitoring/monitoring-solutions-best-practices",
2271-
"redirect_document_id": false
2272-
},
2273-
{
2274-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-creating.md",
2275-
"redirect_url": "/azure/monitoring/monitoring-solutions-creating",
2276-
"redirect_document_id": false
2277-
},
2278-
{
2279-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-automation.md",
2280-
"redirect_url": "/azure/monitoring/monitoring-solutions-resources-automation",
2281-
"redirect_document_id": false
2282-
},
2283-
{
2284-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-searches-alerts.md",
2285-
"redirect_url": "/azure/monitoring/monitoring-solutions-resources-searches-alerts",
2286-
"redirect_document_id": false
2287-
},
2288-
{
2289-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-views.md",
2290-
"redirect_url": "/azure/monitoring/monitoring-solutions-resources-views",
2291-
"redirect_document_id": false
2292-
},
2293-
{
2294-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-solution-file.md",
2295-
"redirect_url": "/azure/monitoring/monitoring-solutions-solution-file",
2296-
"redirect_document_id": false
2297-
},
2298-
{
2299-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions.md",
2300-
"redirect_url": "/azure/monitoring/monitoring-solutions",
2301-
"redirect_document_id": false
2302-
},
2303-
{
2304-
"source_path_from_root": "/articles/operations-management-suite/operations-management-suite-walkthrough-servicemap.md",
2305-
"redirect_url": "/azure/monitoring/monitoring-service-map",
2306-
"redirect_document_id": false
2307-
},
23082208
{
23092209
"source_path_from_root": "/articles/operator-service-manager/overview.md",
23102210
"redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -3100,6 +3000,16 @@
31003000
"redirect_url": "https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-twilio-sendgrid-account",
31013001
"redirect_document_id": false
31023002
},
3003+
{
3004+
"source_path_from_root": "/articles/synapse-analytics/whats-new.md",
3005+
"redirect_url": "/fabric/get-started/whats-new",
3006+
"redirect_document_id": false
3007+
},
3008+
{
3009+
"source_path_from_root": "/articles/synapse-analytics/whats-new-archive.md",
3010+
"redirect_url": "/fabric/get-started/whats-new",
3011+
"redirect_document_id": false
3012+
},
31033013
{
31043014
"source_path_from_root": "/articles/terraform/terrafom-quickstart.md",
31053015
"redirect_url": "/azure/terraform/terraform-create-configuration",
@@ -3691,4 +3601,4 @@
36913601
"redirect_document_id": false
36923602
}
36933603
]
3694-
}
3604+
}

articles/active-directory-b2c/faq.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,11 @@ sections:
2222
- question: |
2323
What is Microsoft Entra External ID?
2424
answer: |
25-
We announced an early preview of our next-generation Microsoft Entra External ID solution. This early preview represents an evolutionary step in unifying secure and engaging experiences across all external identities including partners, customers, citizens, patients, and others within a single, integrated platform. For more information about the preview, see [What is Microsoft Entra External ID for customers?](../active-directory/external-identities/customers/overview-customers-ciam.md).
25+
We have released our next generation Microsoft Entra External ID product which combines powerful solutions for working with people outside of your organization. With External ID capabilities, you can allow external identities to securely access your apps and resources. Whether you’re working with external partners, consumers, or business customers, users can bring their own identities. These identities can range from corporate or government-issued accounts to social identity providers like Google or Facebook. For more information, see [Introduction to Microsoft Entra External ID](/entra/external-id/external-identities-overview)
2626
- question: |
2727
How does this preview affect me?
2828
answer: |
29-
No action is required on your part at this time. The next-generation platform is currently in early preview only. We remain fully committed to supporting your current Azure AD B2C solution. There are no requirements for Azure AD B2C customers to migrate at this time and no plans to discontinue the current Azure AD B2C service. As the next generation platform approaches GA, details will be made available to all our valued B2C customers on available options including migration to the new platform.
30-
- question: |
31-
How do I participate in the preview?
32-
answer: |
33-
As the next-generation platform represents our future for customer identity and access management (CIAM), we welcome and encourage your participation and feedback during early preview. If you're interested in joining the early preview, contact your sales team for details.
29+
No action is required on your part at this time. We remain fully committed to supporting your current Azure AD B2C solution. There are no requirements for Azure AD B2C customers to migrate at this time and no plans to discontinue the current Azure AD B2C service.
3430
- name: General
3531
questions:
3632
- question: |
@@ -119,7 +115,7 @@ sections:
119115
Currently, you can’t change the "From:" field on the email.
120116
121117
> [!TIP]
122-
> With Azure AD B2C [custom policy](custom-policy-overview.md), you can customize the email Azure AD B2C sends to users, including the "From:" field on the email. The custom email verification requires the use of a third-party email provider like [Mailjet](custom-email-mailjet.md), [SendGrid](custom-email-sendgrid.md), or [SparkPost](https://messagebird.com/email/cloud-sending?sp=true).
118+
> With Azure AD B2C [custom policy](custom-policy-overview.md), you can customize the email Azure AD B2C sends to users, including the "From:" field on the email. The custom email verification requires the use of a third-party email provider like [Mailjet](custom-email-mailjet.md) or [SendGrid](custom-email-sendgrid.md).
123119
124120
- question: |
125121
How can I migrate my existing user names, passwords, and profiles from my database to Azure AD B2C?

articles/active-directory-b2c/identity-provider-mobile-id.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ To enable sign-in for users with Mobile ID in Azure AD B2C, you need to create a
4646

4747
|Key |Note |
4848
|---------|---------|
49-
| Client ID | The Mobile ID client ID. For example, 11111111-2222-3333-4444-555555555555. |
49+
| Client ID | The Mobile ID client ID. For example, 00001111-aaaa-2222-bbbb-3333cccc4444. |
5050
| Client Secret| The Mobile ID client secret.|
5151

5252

articles/active-directory-b2c/identity-provider-ping-one.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ zone_pivot_groups: b2c-policy-type
2525

2626
## Create a PingOne application
2727

28-
To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. For more information, see [Adding or updating an OIDC application](https://docs.pingidentity.com/access/sources/dita/topic?resourceid=p14e_add_update_oidc_application) in the Ping Identity documentation. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
28+
To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
2929

3030
1. Sign in to the Ping Identity Administrator Console with your PingOne account credentials.
3131
1. In the left menu of the page, select **Connections**, then next to **Applications**, select **+**.

articles/active-directory-b2c/identity-provider-swissid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To enable sign-in for users with a SwissID account in Azure AD B2C, you need to
4848
|Key |Note |
4949
|---------|---------|
5050
| Environment| The SwissID OpenId well-known configuration endpoint. For example, `https://login.sandbox.pre.swissid.ch/idp/oauth2/.well-known/openid-configuration`. |
51-
| Client ID | The SwissID client ID. For example, `11111111-2222-3333-4444-555555555555`. |
51+
| Client ID | The SwissID client ID. For example, `00001111-aaaa-2222-bbbb-3333cccc4444`. |
5252
| Password| The SwissID client secret.|
5353

5454

articles/active-directory-b2c/implicit-flow-single-page-application.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ In this request, the client indicates the permissions that it needs to acquire f
4747

4848
- `{tenant}` with the name of your Azure AD B2C tenant.
4949

50-
- `90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6` with the app ID of the application you've registered in your tenant.
50+
- `00001111-aaaa-2222-bbbb-3333cccc4444` with the app ID of the application you've registered in your tenant.
5151

5252
- `{policy}` with the name of a policy you've created in your tenant, for example `b2c_1_sign_in`.
5353

5454
```http
5555
GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/authorize?
56-
client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
56+
client_id=00001111-aaaa-2222-bbbb-3333cccc4444
5757
&response_type=id_token+token
5858
&redirect_uri=https%3A%2F%2Faadb2cplayground.azurewebsites.net%2F
5959
&response_mode=fragment
@@ -88,7 +88,7 @@ GET https://aadb2cplayground.azurewebsites.net/#
8888
access_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...
8989
&token_type=Bearer
9090
&expires_in=3599
91-
&scope="90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6 offline_access",
91+
&scope="00001111-aaaa-2222-bbbb-3333cccc4444 offline_access",
9292
&id_token=eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6Ik5HVEZ2ZEstZnl0aEV1Q...
9393
&state=arbitrary_data_you_sent_earlier
9494
```
@@ -175,7 +175,7 @@ In a typical web app flow, you would make a request to the `/token` endpoint. Ho
175175

176176
```http
177177
https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/authorize?
178-
client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
178+
client_id=00001111-aaaa-2222-bbbb-3333cccc4444
179179
&response_type=token
180180
&redirect_uri=https%3A%2F%2Faadb2cplayground.azurewebsites.net%2F
181181
&scope=https%3A%2F%2Fapi.contoso.com%2Ftasks.read
@@ -265,4 +265,4 @@ GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/
265265

266266
## Next steps
267267

268-
See the code sample: [Sign-in with Azure AD B2C in a JavaScript SPA](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-browser-samples/VanillaJSTestApp2.0/app/b2c).
268+
See the code sample: [Sign-in with Azure AD B2C in a JavaScript SPA](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-browser-samples/VanillaJSTestApp2.0/app/b2c).

articles/active-directory-b2c/json-transformations.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ The following claims transformation outputs a JSON string claim that will be the
231231

232232
- Input claims:
233233
- **email**, transformation claim type **customerEntity.email**: "[email protected]"
234-
- **objectId**, transformation claim type **customerEntity.userObjectId** "01234567-89ab-cdef-0123-456789abcdef"
234+
- **objectId**, transformation claim type **customerEntity.userObjectId** "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb"
235235
- **givenName**, transformation claim type **customerEntity.firstName** "John"
236236
- **surname**, transformation claim type **customerEntity.lastName** "Smith"
237237
- Input parameter:
@@ -244,7 +244,7 @@ The following claims transformation outputs a JSON string claim that will be the
244244
{
245245
"customerEntity":{
246246
"email":"[email protected]",
247-
"userObjectId":"01234567-89ab-cdef-0123-456789abcdef",
247+
"userObjectId":"aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
248248
"firstName":"John",
249249
"lastName":"Smith",
250250
"role":{
@@ -264,7 +264,7 @@ The **GenerateJson** claims transformation accepts plain strings. If an input cl
264264
{
265265
"customerEntity":{
266266
"email":"[\"[email protected]\"]",
267-
"userObjectId":"01234567-89ab-cdef-0123-456789abcdef",
267+
"userObjectId":"aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
268268
"firstName":"John",
269269
"lastName":"Smith",
270270
"role":{

0 commit comments

Comments
 (0)