Skip to content

Commit e79139c

Browse files
authored
Merge pull request #212487 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 9/26
2 parents 4b6ca08 + fc692be commit e79139c

31 files changed

+574
-153
lines changed

articles/active-directory/manage-apps/configure-user-consent.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ To configure user consent settings through the Azure portal:
4949

5050
# [PowerShell](#tab/azure-powershell)
5151

52-
To choose which app consent policy governs user consent for applications, you can use the latest [Azure AD PowerShell](/powershell/module/azuread/?view=azureadps-2.0&preserve-view=true) module.
52+
To choose which app consent policy governs user consent for applications, you can use the [Microsoft Graph PowerShell](/powershell/microsoftgraph/get-started?view=graph-powershell-1.0&preserve-view=true) module. The cmdlets used here are included in the [Microsoft.Graph.Identity.SignIns](https://www.powershellgallery.com/packages/Microsoft.Graph.Identity.SignIns) module.
5353

54-
> [!NOTE]
55-
> The instructions below use the generally available Azure AD PowerShell module ([AzureAD](https://www.powershellgallery.com/packages/AzureAD)). The parameter names are different in the preview version of this module ([AzureADPreview](https://www.powershellgallery.com/packages/AzureADPreview)). If you have both modules installed, ensure you're using the cmdlet from the correct module by first running:
56-
>
57-
> ```powershell
58-
> Remove-Module AzureADPreview -ErrorAction SilentlyContinue
59-
> Import-Module AzureAD
60-
> ```
54+
#### Connect to Microsoft Graph PowerShell
55+
56+
Connect to Microsoft Graph PowerShell using the least-privilege permission needed. For reading the current user consent settings, use *Policy.Read.All*. For reading and changing the user consent settings, use *Policy.ReadWrite.Authorization*.
57+
58+
```powershell
59+
Connect-MgGraph -Scopes "Policy.ReadWrite.Authorization"
60+
```
6161

6262
#### Disable user consent
6363

6464
To disable user consent, set the consent policies that govern user consent to empty:
6565

6666
```powershell
67-
Set-AzureADMSAuthorizationPolicy -DefaultUserRolePermissions @{
67+
Update-MgPolicyAuthorizationPolicy -DefaultUserRolePermissions @{
6868
"PermissionGrantPoliciesAssigned" = @() }
6969
```
7070

@@ -73,7 +73,7 @@ Set-AzureADMSAuthorizationPolicy -DefaultUserRolePermissions @{
7373
To allow user consent, choose which app consent policy should govern users' authorization to grant consent to apps:
7474

7575
```powershell
76-
Set-AzureADMSAuthorizationPolicy -DefaultUserRolePermissions @{
76+
Update-MgPolicyAuthorizationPolicy -DefaultUserRolePermissions @{
7777
"PermissionGrantPoliciesAssigned" = @("managePermissionGrantsForSelf.{consent-policy-id}") }
7878
```
7979

@@ -87,7 +87,7 @@ Replace `{consent-policy-id}` with the ID of the policy you want to apply. You c
8787
For example, to enable user consent subject to the built-in policy `microsoft-user-default-low`, run the following commands:
8888

8989
```powershell
90-
Set-AzureADMSAuthorizationPolicy -DefaultUserRolePermissions @{
90+
Update-MgPolicyAuthorizationPolicy -DefaultUserRolePermissions @{
9191
"PermissionGrantPoliciesAssigned" = @("managePermissionGrantsForSelf.microsoft-user-default-low") }
9292
```
9393

articles/active-directory/manage-apps/manage-app-consent-policies.md

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ ms.custom: contperf-fy21q2
1717

1818
# Manage app consent policies
1919

20-
With Azure AD PowerShell, you can view and manage app consent policies.
20+
With [Microsoft Graph PowerShell](/powershell/microsoftgraph/get-started?view=graph-powershell-1.0&preserve-view=true), you can view and manage app consent policies.
2121

22-
An app consent policy consists of one or more "includes" condition sets and zero or more "excludes" condition sets. For an event to be considered in an app consent policy, it must match *at least* one "includes" condition set, and must not match *any* "excludes" condition set.
22+
An app consent policy consists of one or more "include" condition sets and zero or more "exclude" condition sets. For an event to be considered in an app consent policy, it must match *at least* one "include" condition set, and must not match *any* "exclude" condition set.
2323

2424
Each condition set consists of several conditions. For an event to match a condition set, *all* conditions in the condition set must be met.
2525

@@ -33,10 +33,10 @@ App consent policies where the ID begins with "microsoft-" are built-in policies
3333
- A custom directory role with the necessary [permissions to manage app consent policies](../roles/custom-consent-permissions.md#managing-app-consent-policies)
3434
- The Microsoft Graph app role (application permission) Policy.ReadWrite.PermissionGrant (when connecting as an app or a service)
3535

36-
1. Connect to [Azure AD PowerShell](/powershell/module/azuread/).
36+
1. Connect to [Microsoft Graph PowerShell](/powershell/microsoftgraph/get-started?view=graph-powershell-1.0&preserve-view=true).
3737

3838
```powershell
39-
Connect-AzureAD
39+
Connect-MgGraph -Scopes "Policy.ReadWrite.PermissionGrant"
4040
```
4141

4242
## List existing app consent policies
@@ -46,21 +46,19 @@ It's a good idea to start by getting familiar with the existing app consent poli
4646
1. List all app consent policies:
4747

4848
```powershell
49-
Get-AzureADMSPermissionGrantPolicy | ft Id, DisplayName, Description
49+
Get-MgPolicyPermissionGrantPolicy | ft Id, DisplayName, Description
5050
```
5151

52-
1. View the "includes" condition sets of a policy:
52+
1. View the "include" condition sets of a policy:
5353

5454
```powershell
55-
Get-AzureADMSPermissionGrantConditionSet -PolicyId "microsoft-application-admin" `
56-
-ConditionSetType "includes"
55+
Get-MgPolicyPermissionGrantPolicyInclude -PermissionGrantPolicyId "microsoft-application-admin" | fl
5756
```
5857
59-
1. View the "excludes" condition sets:
58+
1. View the "exclude" condition sets:
6059
6160
```powershell
62-
Get-AzureADMSPermissionGrantConditionSet -PolicyId "microsoft-application-admin" `
63-
-ConditionSetType "excludes"
61+
Get-MgPolicyPermissionGrantPolicyExclude -PermissionGrantPolicyId "microsoft-application-admin" | fl
6462
```
6563
6664
## Create a custom app consent policy
@@ -70,36 +68,34 @@ Follow these steps to create a custom app consent policy:
7068
1. Create a new empty app consent policy.
7169
7270
```powershell
73-
New-AzureADMSPermissionGrantPolicy `
71+
New-MgPolicyPermissionGrantPolicy `
7472
-Id "my-custom-policy" `
7573
-DisplayName "My first custom consent policy" `
7674
-Description "This is a sample custom app consent policy."
7775
```
7876

79-
1. Add "includes" condition sets.
77+
1. Add "include" condition sets.
8078

8179
```powershell
8280
# Include delegated permissions classified "low", for apps from verified publishers
83-
New-AzureADMSPermissionGrantConditionSet `
84-
-PolicyId "my-custom-policy" `
85-
-ConditionSetType "includes" `
81+
New-MgPolicyPermissionGrantPolicyInclude `
82+
-PermissionGrantPolicyId "my-custom-policy" `
8683
-PermissionType "delegated" `
8784
-PermissionClassification "low" `
88-
-ClientApplicationsFromVerifiedPublisherOnly $true
85+
-ClientApplicationsFromVerifiedPublisherOnly
8986
```
9087

9188
Repeat this step to add additional "include" condition sets.
9289

93-
1. Optionally, add "excludes" condition sets.
90+
1. Optionally, add "exclude" condition sets.
9491

9592
```powershell
9693
# Retrieve the service principal for the Azure Management API
97-
$azureApi = Get-AzureADServicePrincipal -Filter "servicePrincipalNames/any(n:n eq 'https://management.azure.com/')"
94+
$azureApi = Get-MgServicePrincipal -Filter "servicePrincipalNames/any(n:n eq 'https://management.azure.com/')"
9895
9996
# Exclude delegated permissions for the Azure Management API
100-
New-AzureADMSPermissionGrantConditionSet `
101-
-PolicyId "my-custom-policy" `
102-
-ConditionSetType "excludes" `
97+
New-MgPolicyPermissionGrantPolicyExclude `
98+
-PermissionGrantPolicyId "my-custom-policy" `
10399
-PermissionType "delegated" `
104100
-ResourceApplication $azureApi.AppId
105101
```
@@ -113,7 +109,7 @@ Once the app consent policy has been created, you can [allow user consent](confi
113109
1. The following shows how you can delete a custom app consent policy. **This action cannot be undone.**
114110

115111
```powershell
116-
Remove-AzureADMSPermissionGrantPolicy -Id "my-custom-policy"
112+
Remove-MgPolicyPermissionGrantPolicy -PermissionGrantPolicyId "my-custom-policy"
117113
```
118114

119115
> [!WARNING]
@@ -134,7 +130,7 @@ The following table provides the list of supported conditions for app consent po
134130
| ClientApplicationIds | A list of **AppId** values for the client applications to match with, or a list with the single value "all" to match any client application. Default is the single value "all". |
135131
| ClientApplicationTenantIds | A list of Azure Active Directory tenant IDs in which the client application is registered, or a list with the single value "all" to match with client apps registered in any tenant. Default is the single value "all". |
136132
| ClientApplicationPublisherIds | A list of Microsoft Partner Network (MPN) IDs for [verified publishers](../develop/publisher-verification-overview.md) of the client application, or a list with the single value "all" to match with client apps from any publisher. Default is the single value "all". |
137-
| ClientApplicationsFromVerifiedPublisherOnly | Set to `$true` to only match on client applications with a [verified publishers](../develop/publisher-verification-overview.md). Set to `$false` to match on any client app, even if it does not have a verified publisher. Default is `$false`. |
133+
| ClientApplicationsFromVerifiedPublisherOnly | Set this switch to only match on client applications with a [verified publishers](../develop/publisher-verification-overview.md). Disable this switch (`-ClientApplicationsFromVerifiedPublisherOnly:$false`) to match on any client app, even if it does not have a verified publisher. Default is `$false`. |
138134

139135
## Next steps
140136

articles/api-management/api-management-get-started-publish-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Enter the values from the following table. Then select **Create** to create your
6060
|---------|---------|---------|
6161
|**Name** | *demo-conference-api-v1* | Unique name in your API Management instance.<br/><br/>Because a version is in fact a new API based off an API's [revision](api-management-get-started-revise-api.md), this setting is the new API's name. |
6262
|**Versioning scheme** | **Path** | The way callers specify the API version. |
63-
|**Version identifer** | *v1* | Scheme-specific indicator of the version. For **Path**, the suffix for the API URL path. <br/><br/> If **Header** or **Query string** is selected, enter an additional value: the name of the header or query string parameter.<br/><br/> A usage example is displayed. |
63+
|**Version identifier** | *v1* | Scheme-specific indicator of the version. For **Path**, the suffix for the API URL path. <br/><br/> If **Header** or **Query string** is selected, enter an additional value: the name of the header or query string parameter.<br/><br/> A usage example is displayed. |
6464
|**Products** | **Unlimited** | Optionally, one or more products that the API version is associated with. To publish the API, you must associate it with a product. You can also [add the version to a product](#add-the-version-to-a-product) later. |
6565

6666
After creating the version, it now appears underneath **Demo Conference API** in the API List. You now see two APIs: **Original**, and **v1**.

articles/azure-monitor/agents/data-collection-text-log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ do
518518
$randomContent = New-Guid
519519
$logRecord = "$(Get-Date -format s)Z Record number $count with random content $randomContent"
520520
$logRecord | Out-File "$logFolder\\$logFileName" -Encoding utf8 -Append
521-
Sleep $sleepSeconds
521+
Start-Sleep $sleepSeconds
522522
}
523523
while ($true)
524524

articles/backup/backup-vault-overview.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview of Backup vaults
33
description: An overview of Backup vaults.
44
ms.topic: conceptual
5-
ms.date: 02/14/2022
5+
ms.date: 09/26/2022
66
ms.custom: references_regions
77
author: v-amallick
88
ms.service: backup
@@ -120,7 +120,7 @@ In the **Backup Instances** tile, you get a summarized view of all backup instan
120120

121121
![Backup jobs](./media/backup-vault-overview/backup-jobs.png)
122122

123-
## Move a Backup vault across Azure subscriptions/resource groups (Public Preview)
123+
## Move a Backup vault across Azure subscriptions/resource groups
124124

125125
This section explains how to move a Backup vault (configured for Azure Backup) across Azure subscriptions and resource groups using the Azure portal.
126126

@@ -241,7 +241,13 @@ Troubleshoot the following common issues you might encounter during Backup vault
241241

242242
**Cause**: Resource move for Backup vault is currently not supported in the selected Azure region.
243243

244-
**Recommendation**: Ensure that you've selected one of the supported regions to move Backup vaults. See [Supported regions](#supported-regions).
244+
**Recommendation**: Ensure that you've selected one of the supported regions to move Backup vaults. See [Supported regions](#supported-regions
245+
246+
#### UserErrorCrossTenantMSIMoveNotSupported
247+
248+
**Cause**: This error occurs if the subscription with which resource is associated has moved to a different Tenant, but the Managed Identity is still associated with the old Tenant.
249+
250+
**Recommendation**: Remove the Managed Identity from the existing Tenant; move the resource and add it again to the new one.
245251

246252
## Next steps
247253

0 commit comments

Comments
 (0)