Skip to content

Commit 9b209d3

Browse files
denisebmsftdenisebmsft
authored
Merge branch 'main' into patch-1
2 parents 1c4cb93 + b87a358 commit 9b209d3

File tree

83 files changed

+4876
-1758
lines changed

Some content is hidden

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

83 files changed

+4876
-1758
lines changed

‎.github/workflows/AutoLabelAssign.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
jobs:
1515
download-payload:
1616
name: Download and extract payload artifact
17+
if: github.repository_owner == 'MicrosoftDocs'
1718
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
1819
with:
1920
WorkflowId: ${{ github.event.workflow_run.id }}
@@ -23,6 +24,7 @@ jobs:
2324

2425
label-assign:
2526
name: Run assign and label
27+
if: github.repository_owner == 'MicrosoftDocs'
2628
needs: [download-payload]
2729
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
2830
with:
@@ -32,4 +34,4 @@ jobs:
3234
ExcludedUserList: '["user1", "user2"]'
3335
ExcludedBranchList: '["branch1", "branch2"]'
3436
secrets:
35-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
37+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/AutoLabelMsftContributor.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
download-payload:
16-
if: github.repository_visibility == 'public'
16+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
1717
name: Download and extract payload artifact
1818
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
1919
with:
@@ -24,11 +24,12 @@ jobs:
2424

2525
label-msft:
2626
name: Label Microsoft contributors
27-
if: github.repository_visibility == 'public'
27+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'public'
2828
needs: [download-payload]
2929
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
3030
with:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
secrets:
3333
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34-
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
34+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
35+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}

‎.github/workflows/AutoPublish.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: (Scheduled) Publish to live
2+
3+
permissions:
4+
contents: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "25 5,11,17,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
10+
11+
workflow_dispatch:
12+
13+
jobs:
14+
15+
auto-publish:
16+
if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
18+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
EnableAutoPublish: true
21+
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
25+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

‎.github/workflows/BackgroundTasks.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
jobs:
1111
upload:
12+
if: github.repository_owner == 'MicrosoftDocs'
1213
runs-on: ubuntu-latest
1314

1415
steps:
@@ -23,4 +24,4 @@ jobs:
2324
- uses: actions/upload-artifact@v4
2425
with:
2526
name: PayloadJson
26-
path: pr/
27+
path: pr/

‎.github/workflows/BuildValidation.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR has no warnings or errors
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
11+
jobs:
12+
13+
build-status:
14+
if: github.repository_owner == 'MicrosoftDocs'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/LiveMergeCheck.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ on:
1212
jobs:
1313

1414
live-merge:
15+
if: github.repository_owner == 'MicrosoftDocs'
1516
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
1617
with:
1718
PayloadJson: ${{ toJSON(github) }}
1819
secrets:
19-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/PrFileCount.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ on:
1212
jobs:
1313

1414
file-count:
15+
if: github.repository_owner == 'MicrosoftDocs'
1516
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
1617
with:
1718
PayloadJson: ${{ toJSON(github) }}
1819
secrets:
19-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ProtectedFiles.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ on: [pull_request_target]
1010
jobs:
1111

1212
protected-files:
13+
if: github.repository_owner == 'MicrosoftDocs'
1314
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
1415
with:
1516
PayloadJson: ${{ toJSON(github) }}
1617
secrets:
17-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
18+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/Stale.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: (Scheduled) Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
workflow_dispatch:
11+
12+
jobs:
13+
stale:
14+
if: github.repository_owner == 'MicrosoftDocs'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-Stale.yml@workflows-prod
16+
with:
17+
RunDebug: false
18+
RepoVisibility: ${{ github.repository_visibility }}
19+
secrets:
20+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/StaleBranch.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: (Scheduled) Stale branch removal
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
schedule:
8+
- cron: "0 9 1 * *"
9+
10+
# workflow_dispatch:
11+
12+
13+
jobs:
14+
15+
stale-branch:
16+
if: github.repository_owner == 'MicrosoftDocs'
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-StaleBranch.yml@workflows-prod
18+
with:
19+
PayloadJson: ${{ toJSON(github) }}
20+
RepoBranchSkipList: '[
21+
"ExampleBranch1",
22+
"ExampleBranch2"
23+
]'
24+
ReportOnly: false
25+
secrets:
26+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/TierManagement.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Tier management
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
issue_comment:
9+
types: [created, edited]
10+
11+
jobs:
12+
13+
tier-mgmt:
14+
if: github.repository_owner == 'MicrosoftDocs' && github.repository_visibility == 'private'
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-TierManagement.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
EnableWriteSignOff: 1
19+
EnableReadOnlySignoff: 1
20+
secrets:
21+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎docset/docfx.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"ROBOTS": "INDEX, FOLLOW",
7676
"breadcrumb_path": "/powershell/windows/bread/toc.json",
7777
"ms.service": "windows-11",
78-
"ms.topic": "managed-reference",
78+
"ms.topic": "reference",
7979
"ms.author": "jgerend",
8080
"author": "JasonGerend",
8181
"manager": "femila",
@@ -93,9 +93,14 @@
9393
"dstrome",
9494
"v-dihans",
9595
"sdwheeler",
96+
"v-stchambers",
97+
"shdyas",
9698
"Stacyrch140",
9799
"v-stsavell",
98-
"American-Dipper"
100+
"American-Dipper",
101+
"Ruchika-mittal01",
102+
"aditisrivastava07",
103+
"padmagit77"
99104
],
100105
"_op_documentIdPathDepotMapping": {
101106
"./": {

‎docset/winserver2016-ps/adfs/New-AdfsAzureMfaTenantCertificate.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
33
external help file: Microsoft.IdentityServer.Management.dll-Help.xml
44
Module Name: ADFS
55
ms.date: 12/20/2016
6-
ms.custom: has-azure-ad-ps-ref, azure-ad-ref-level-one-done
6+
ms.custom: no-azure-ad-ps-ref
77
online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2016-ps&wt.mc_id=ps-gethelp
88
schema: 2.0.0
99
title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
3636
### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
3737
```
3838
PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
39-
PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
39+
PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
4040
PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
4141
```
4242

4343
These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
4444

45-
> [!NOTE]
46-
> Customers are encouraged to use the newer [Microsoft Graph PowerShell](/powershell/microsoftgraph/overview) module.
47-
4845
### Example 2: Determine which certificate Azure MFA is using
4946
```
5047
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID

‎docset/winserver2016-ps/adfs/Set-AdfsAzureMfaTenant.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
33
external help file: Microsoft.IdentityServer.Management.dll-Help.xml
44
Module Name: ADFS
55
ms.date: 12/20/2016
6-
ms.custom: has-azure-ad-ps-ref
6+
ms.custom: no-azure-ad-ps-ref
77
online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2016-ps&wt.mc_id=ps-gethelp
88
schema: 2.0.0
99
title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
2828
### Example 1: Enable Azure MFA
2929
```
3030
PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
31-
PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
31+
PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
3232
PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
3333
```
3434

‎docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
33
external help file: Microsoft.IdentityServer.Management.dll-Help.xml
44
Module Name: ADFS
55
ms.date: 12/20/2016
6-
ms.custom: has-azure-ad-ps-ref, azure-ad-ref-level-one-done
6+
ms.custom: no-azure-ad-ps-ref
77
online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2019-ps&wt.mc_id=ps-gethelp
88
schema: 2.0.0
99
title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
3636
### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
3737
```
3838
PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
39-
PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
39+
PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
4040
PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
4141
```
4242

4343
These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
4444

45-
> [!NOTE]
46-
> Customers are encouraged to use the newer [Microsoft Graph PowerShell](/powershell/microsoftgraph/overview) module.
47-
4845
### Example 2: Determine which certificate Azure MFA is using
4946
```
5047
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID

‎docset/winserver2019-ps/adfs/Set-AdfsAzureMfaTenant.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
33
external help file: Microsoft.IdentityServer.Management.dll-Help.xml
44
Module Name: ADFS
55
ms.date: 12/20/2016
6-
ms.custom: has-azure-ad-ps-ref
6+
ms.custom: no-azure-ad-ps-ref
77
online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2019-ps&wt.mc_id=ps-gethelp
88
schema: 2.0.0
99
title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
2828
### Example 1: Enable Azure MFA
2929
```
3030
PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
31-
PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
31+
PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
3232
PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
3333
```
3434

‎docset/winserver2022-ps/adfs/New-AdfsAzureMfaTenantCertificate.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
33
external help file: Microsoft.IdentityServer.Management.dll-Help.xml
44
Module Name: ADFS
55
ms.date: 12/20/2016
6-
ms.custom: has-azure-ad-ps-ref
6+
ms.custom: no-azure-ad-ps-ref
77
online version: https://learn.microsoft.com/powershell/module/adfs/new-adfsazuremfatenantcertificate?view=windowsserver2022-ps&wt.mc_id=ps-gethelp
88
schema: 2.0.0
99
title: New-AdfsAzureMfaTenantCertificate
@@ -36,15 +36,12 @@ If it does not find one, it generates it.
3636
### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
3737
```
3838
PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
39-
PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
39+
PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
4040
PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
4141
```
4242

4343
These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
4444

45-
> [!NOTE]
46-
> Customers are encouraged to use the newer Azure Active Directory PowerShell 2.0 module. For more information about the v2.0 module, see [AzureAD PowerShell 2.0](/powershell/module/Azuread/?view=azureadps-2.0).
47-
4845
### Example 2: Determine which certificate Azure MFA is using
4946
```
5047
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID

‎docset/winserver2022-ps/adfs/Set-AdfsAzureMfaTenant.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Use this topic to help manage Windows and Windows Server technologi
33
external help file: Microsoft.IdentityServer.Management.dll-Help.xml
44
Module Name: ADFS
55
ms.date: 12/20/2016
6-
ms.custom: has-azure-ad-ps-ref
6+
ms.custom: no-azure-ad-ps-ref
77
online version: https://learn.microsoft.com/powershell/module/adfs/set-adfsazuremfatenant?view=windowsserver2022-ps&wt.mc_id=ps-gethelp
88
schema: 2.0.0
99
title: Set-AdfsAzureMfaTenant
@@ -28,7 +28,7 @@ The **Set-AdfsAzureMfaTenant** cmdlet enables an Active Directory Federation Ser
2828
### Example 1: Enable Azure MFA
2929
```
3030
PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
31-
PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
31+
PS C:\> Add-MgServicePrincipalKey -ServicePrincipalId <service principal ID> -KeyCredential $certbase64
3232
PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
3333
```
3434

0 commit comments

Comments
 (0)