Skip to content

Commit 5d74e3d

Browse files
CompuMetalGeekCompuMetalGeek
authored
Merge branch 'main' into patch-1
2 parents a7e7bf0 + 13e73dc commit 5d74e3d

File tree

9 files changed

+18
-28
lines changed

9 files changed

+18
-28
lines changed

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

Lines changed: 2 additions & 5 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 5 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 5 deletions
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

Lines changed: 2 additions & 2 deletions
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

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

Lines changed: 2 additions & 5 deletions
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=windowsserver2025-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/winserver2025-ps/adfs/Set-AdfsAzureMfaTenant.md

Lines changed: 2 additions & 2 deletions
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=windowsserver2025-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/winserver2025-ps/netsecurity/Set-NetFirewallRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,8 @@ The acceptable formats for this parameter are:
891891
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
892892
- IPv4 Range: 1.2.3.4 through 1.2.3.7
893893
- IPv6 Range: fe80::1 through fe80::9
894+
- Keyword: Any, LocalSubnet, DNS, DHCP, WINS, DefaultGateway, Internet, Intranet, IntranetRemoteAccess, PlayToDevice, CaptivePortal. Keywords can be restricted to IPv4 or IPv6 by appending a 4 or 6 (for example, keyword "LocalSubnet4" means that all local IPv4 addresses are matching this rule).
895+
894896
Querying for rules with this parameter can only be performed using filter objects.
895897
See the Get-NetFirewallAddressFilter cmdlet for more information.
896898

0 commit comments

Comments
 (0)