Skip to content

Commit 9735c0a

Browse files
Merge branch 'master' into patch-154
2 parents 8e799d3 + 761f025 commit 9735c0a

File tree

11,904 files changed

+143308
-101174
lines changed

Some content is hidden

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

11,904 files changed

+143308
-101174
lines changed

.github/workflows/stale.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Mark stale pull requests
22

33
on:
44
schedule:
5-
- cron: "0 */6 * * *"
5+
- cron: "0 */4 * * *"
66

77
jobs:
88
stale:
@@ -18,9 +18,8 @@ jobs:
1818
stale-pr-label: inactive
1919
close-pr-label: auto-close
2020
exempt-pr-labels: keep-open
21-
operations-per-run: 700
22-
ascending: true
23-
start-date: '2020-12-17'
21+
operations-per-run: 1000
22+
ascending: false
2423
stale-pr-message: >
2524
This pull request has been inactive for at least 14 days.
2625
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.publish.config.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,12 @@
357357
"branch": "main",
358358
"branch_mapping": {}
359359
},
360+
{
361+
"path_to_root": "media-services-v3-dotnet-core-functions-integration",
362+
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-core-functions-integration",
363+
"branch": "main",
364+
"branch_mapping": {}
365+
},
360366
{
361367
"path_to_root": "samples-javascript",
362368
"url": "https://github.com/Microsoft/tsiclient",
@@ -816,6 +822,7 @@
816822
".openpublishing.redirection.healthcare-apis.json",
817823
".openpublishing.redirection.media-services.json",
818824
".openpublishing.redirection.security-benchmark.json",
825+
".openpublishing.redirection.synapse-analytics.json",
819826
".openpublishing.redirection.key-vault.json",
820827
".openpublishing.redirection.iot-hub.json",
821828
"articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.healthcare-apis.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@
454454
},
455455
{
456456
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/access-fhir-postman-tutorial.md",
457-
"redirect_url": "/azure/healthcare-apis/fhir/using-postman",
457+
"redirect_url": "/azure/healthcare-apis/use-postman",
458458
"redirect_document_id": true
459459
}
460460
]

.openpublishing.redirection.json

Lines changed: 1074 additions & 86 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.key-vault.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,22 @@
489489
"source_path_from_root": "/articles/key-vault/general/key-vault-integrate-kubernetes.md",
490490
"redirect_url": "/azure/aks/csi-secrets-store-driver",
491491
"redirect_document_id": false
492+
},
493+
494+
{
495+
"source_path_from_root": "/articles/key-vault/general/assign-access-policy-portal.md",
496+
"redirect_url": "/azure/key-vault/general/assign-access-policy",
497+
"redirect_document_id": false
498+
},
499+
{
500+
"source_path_from_root": "/articles/key-vault/general/assign-access-policy-cli.md",
501+
"redirect_url": "/azure/key-vault/general/assign-access-policy",
502+
"redirect_document_id": false
503+
},
504+
{
505+
"source_path_from_root": "/articles/key-vault/general/assign-access-policy-powershell.md",
506+
"redirect_url": "/azure/key-vault/general/assign-access-policy",
507+
"redirect_document_id": false
492508
}
493509

494510
]
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-browse-partners.md",
5+
"redirect_url": "/azure/synapse-analytics/partner/browse-partners",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-business-intelligence.md",
10+
"redirect_url": "/azure/synapse-analytics/partner/business-intelligence",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-compatibility-issues.md",
15+
"redirect_url": "/azure/synapse-analytics/partner/compatibility-issues",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-data-integration.md",
20+
"redirect_url": "/azure/synapse-analytics/partner/data-integration",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-data-management.md",
25+
"redirect_url": "/azure/synapse-analytics/partner/data-management",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-machine-learning-ai.md",
30+
"redirect_url": "/azure/synapse-analytics/partner/machine-learning-ai",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-partner-system-integration.md",
35+
"redirect_url": "/azure/synapse-analytics/partner/system-integration",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/synapse-analytics/sql-data-warehouse/guidance-for-loading-data.md",
40+
"redirect_url": "/azure/synapse-analytics/sql/data-loading-best-practices",
41+
"redirect_document_id": false
42+
}
43+
]
44+
}

articles/active-directory-b2c/TOC.yml

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -332,15 +332,23 @@
332332
href: configure-tokens.md
333333
- name: Define custom attributes
334334
href: user-flow-custom-attributes.md
335-
- name: Security and threat management
335+
- name: Security
336336
items:
337-
- name: Investigate risk with Identity Protection
338-
href: identity-protection-investigate-risk.md
339-
- name: Configure Conditional Access
340-
href: conditional-access-user-flow.md
341-
- name: Mitigate credential attacks
342-
displayName: smart lockout, account lockout, password attack
343-
href: threat-management.md
337+
- name: Monitoring and threat management
338+
items:
339+
- name: Azure Monitor
340+
href: azure-monitor.md
341+
- name: Azure Sentinel
342+
href: azure-sentinel.md
343+
displayName: log, logs, logging, events, Azure Monitor, Azure Sentinel, SIEM, threat hunting, Security, Security Orchestration
344+
- name: Web Application Firewall partners
345+
items:
346+
- name: Akamai
347+
href: partner-akamai.md
348+
- name: Azure WAF
349+
href: partner-azure-web-application-firewall.md
350+
- name: Cloudflare
351+
href: partner-cloudflare.md
344352
- name: Fraud protection partners
345353
items:
346354
- name: Arkose Labs
@@ -352,6 +360,28 @@
352360
- name: Microsoft Dynamics 365 Fraud Protection
353361
href: partner-dynamics-365-fraud-protection.md
354362
displayName: m365 dynamics, dynamics fraud protection, fraud, 365 protection
363+
- name: Investigate risk with Identity Protection
364+
href: identity-protection-investigate-risk.md
365+
- name: Configure Conditional Access
366+
href: conditional-access-user-flow.md
367+
- name: Mitigate credential attacks
368+
displayName: smart lockout, account lockout, password attack
369+
href: threat-management.md
370+
- name: Secure phone-based MFA
371+
href: phone-based-mfa.md
372+
displayName: multi-factor authentication, Azure Monitor, Log Analytics, reports, reporting, dashboard
373+
- name: Secure access to legacy and on-premises apps
374+
items:
375+
- name: Datawiza
376+
href: partner-datawiza.md
377+
- name: Ping Identity
378+
href: partner-ping-identity.md
379+
- name: Strata
380+
href: partner-strata.md
381+
displayName: AAD b2c access, legacy app, onpremises apps
382+
- name: Zscaler
383+
href: partner-zscaler.md
384+
displayName: zscaler b2c, vpn, sdp b2c
355385
- name: Configure age gating
356386
href: age-gating.md
357387
- name: API connectors
@@ -394,32 +424,12 @@
394424
href: partner-lexisnexis.md
395425
- name: Onfido
396426
href: partner-onfido.md
397-
- name: Secure access to legacy and on-premises apps
398-
items:
399-
- name: Datawiza
400-
href: partner-datawiza.md
401-
- name: Ping Identity
402-
href: partner-ping-identity.md
403-
- name: Strata
404-
href: partner-strata.md
405-
displayName: AAD b2c access, legacy app, onpremises apps
406-
- name: Zscaler
407-
href: partner-zscaler.md
408-
displayName: zscaler b2c, vpn, sdp b2c
409427
- name: Domain name
410428
items:
411429
- name: b2clogin.com overview
412430
href: b2clogin.md
413431
- name: Configure a custom domain
414432
href: custom-domain.md
415-
- name: Web Application Firewall partners
416-
items:
417-
- name: Akamai
418-
href: partner-akamai.md
419-
- name: Azure WAF
420-
href: partner-azure-web-application-firewall.md
421-
- name: Cloudflare
422-
href: partner-cloudflare.md
423433
- name: Configure web API domains
424434
href: multiple-token-endpoints.md
425435
displayName: migrate, b2clogin, owin
@@ -430,6 +440,8 @@
430440
displayName: account, accounts, msgraph, ms graph, graph
431441
- name: Deploy with Azure Pipelines
432442
href: deploy-custom-policies-devops.md
443+
- name: Deploy with GitHub Actions
444+
href: deploy-custom-policies-github-action.md
433445
displayName: azure devops, ci/cd, cicd, custom policy, policies
434446
- name: Manage policies with PowerShell
435447
href: manage-custom-policies-powershell.md
@@ -448,23 +460,14 @@
448460
href: partner-n8identity.md
449461
- name: Saviynt
450462
href: partner-saviynt.md
451-
- name: Logs and monitoring
463+
- name: Logs
452464
items:
453465
- name: Audit logs
454466
href: view-audit-logs.md
455-
displayName: log, logs, logging, usage, events, reports, reporting
456-
- name: Azure Monitor
457-
href: azure-monitor.md
458467
displayName: log, logs, logging, usage, events, reports, reporting, dashboard
459-
- name: Azure Sentinel
460-
href: azure-sentinel.md
461-
displayName: log, logs, logging, events, Azure Monitor, Azure Sentinel, SIEM, threat hunting, Security, Security Orchestration
462468
- name: Usage analytics
463469
href: analytics-with-application-insights.md
464470
displayName: application insights, app insights, reports, reporting
465-
- name: Secure phone-based MFA
466-
href: phone-based-mfa.md
467-
displayName: multi-factor authentication, Azure Monitor, Log Analytics, reports, reporting, dashboard
468471
- name: Compliance
469472
items:
470473
- name: User access

articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 08/04/2021
11+
ms.date: 08/29/2021
1212
ms.author: mimart
1313
ms.subservice: B2C
1414
zone_pivot_groups: b2c-policy-type
@@ -88,7 +88,6 @@ Content-type: application/json
8888
"objectId": "ab3ec3b2-a435-45e4-b93a-56a005e88bb7",
8989
"extension_<extensions-app-id>_CustomAttribute1": "custom attribute value",
9090
"extension_<extensions-app-id>_CustomAttribute2": "custom attribute value",
91-
"objectId": "ab3ec3b2-a435-45e4-b93a-56a005e88bb7",
9291
"client_id": "231c70e8-8424-48ac-9b5d-5623b9e4ccf3",
9392
"step": "PreTokenIssuance",
9493
"ui_locales":"en-US"
@@ -320,7 +319,8 @@ Save the files you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensi
320319
## Test the custom policy
321320

322321
1. Sign in to the [Azure portal](https://portal.azure.com).
323-
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your Azure AD tenant.
322+
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
323+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
324324
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
325325
1. Select **Identity Experience Framework**.
326326
1. Select **Upload Custom Policy**, and then upload the policy files that you changed: *TrustFrameworkBase.xml*, and *TrustFrameworkExtensions.xml*, *SignUpOrSignin.xml*, *ProfileEdit.xml*, and *PasswordReset.xml*.

articles/active-directory-b2c/add-api-connector.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,8 @@ To return the promo code claim back to the relying party application, add an out
572572
## Test the custom policy
573573

574574
1. Sign in to the [Azure portal](https://portal.azure.com).
575-
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directory + subscription** filter in the top menu and choosing the directory that contains your Azure AD tenant.
575+
1. Make sure you're using the directory that contains your Azure AD tenant by selecting the **Directories + subscriptions** icon in the portal toolbar.
576+
1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
576577
1. Choose **All services** in the top-left corner of the Azure portal, and then search for and select **App registrations**.
577578
1. Select **Identity Experience Framework**.
578579
1. Select **Upload Custom Policy**, and then upload the policy files that you changed: *TrustFrameworkExtensions.xml*, and *SignUpOrSignin.xml*.

0 commit comments

Comments
 (0)