Skip to content

Commit ed34aa5

Browse files
committed
resolve merge conflict
2 parents 59b7aab + 22f4da9 commit ed34aa5

File tree

1,134 files changed

+20267
-7549
lines changed

Some content is hidden

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

1,134 files changed

+20267
-7549
lines changed

articles/active-directory-domain-services/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure Active Directory Domain Services
33
description: Lists Azure Policy built-in policy definitions for Azure Active Directory Domain Services. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 08/30/2023
4+
ms.date: 09/06/2023
55
ms.service: active-directory
66
ms.subservice: domain-services
77
author: justinha

articles/active-directory/app-proxy/application-proxy-configure-complex-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To publish complex distributed app through Application Proxy with application se
7575

7676
5. In the External Url field, drop down the list and select the custom domain you want to use.
7777

78-
6. Add CORS Rules (optional). For more information see [Configuring CORS Rule](/graph/api/resources/corsconfiguration_v2?view=graph-rest-beta).
78+
6. Add CORS Rules (optional). For more information see [Configuring CORS Rule](/graph/api/resources/corsconfiguration_v2?view=graph-rest-beta&preserve-view=true).
7979

8080
7. Select Create.
8181

articles/active-directory/develop/msal-android-shared-devices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ These Microsoft applications support Azure AD's shared device mode:
9898
- [Microsoft Edge](/microsoft-edge)
9999
- [Outlook](/mem/intune/apps/app-configuration-policies-outlook)
100100
- [Microsoft Power Apps](/power-apps)
101+
- [Microsoft Power BI Mobile](/power-bi/consumer/mobile/) (preview)
101102
- [Microsoft Viva Engage](/viva/engage/overview) (previously [Yammer](/yammer))
102103

103104
## Shared device sign-out and the overall app lifecycle

articles/active-directory/develop/msal-ios-shared-devices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ For iOS, your app requires a background permission to remain active in the backg
248248
These Microsoft applications support Azure AD's shared device mode:
249249

250250
- [Microsoft Teams](/microsoftteams/platform/) (in Public Preview)
251+
- [Microsoft Power BI Mobile](/power-bi/consumer/mobile/) (in Public Preview)
251252

252253
> [!IMPORTANT]
253254
> Public preview is provided without a service-level agreement and isn't recommended for production workloads. Some features might be unsupported or have constrained capabilities. For more information, see [Universal License Terms for Online Services](https://www.microsoft.com/licensing/terms/product/ForOnlineServices/all).

articles/active-directory/develop/multi-service-web-app-authentication-app-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ You now have an app that's secured by the App Service authentication and authori
8080
8181
## Verify limited access to the web app
8282

83-
When you enabled the App Service authentication/authorization module, an app registration was created in your Azure AD tenant. The app registration has the same display name as your web app. To check the settings, select **Azure Active Directory** from the portal menu, and select **App registrations**. Select the app registration that was created. In the overview, verify that **Supported account types** is set to **My organization only**.
83+
When you enabled the App Service authentication/authorization module, an app registration was created in your Azure AD tenant. The app registration has the same display name as your web app. To check the settings, sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer) and browse to **Identity** > **Applications** > **App registrations**. Select the app registration that was created. In the overview, verify that **Supported account types** is set to **My organization only**.
8484

8585
:::image type="content" alt-text="Screenshot that shows verifying access." source="./media/multi-service-web-app-authentication-app-service/verify-access.png":::
8686

articles/active-directory/develop/multi-service-web-app-clean-up-resources.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ This command might take several minutes to run.
3838

3939
## Delete the app registration
4040

41-
From the portal menu, select **Azure Active Directory** > **App registrations**. Then select the application you created.
42-
:::image type="content" alt-text="Screenshot that shows selecting app registration." source="./media/multi-service-web-app-clean-up-resources/select-app-registration.png":::
41+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least an [Application Developer](../roles/permissions-reference.md#application-developer).
42+
1. Browse to **Identity** > **Applications** > **App registrations**.
43+
1. Select the application you created.
44+
1. In the app registration overview, select **Delete**.
4345

44-
In the app registration overview, select **Delete**.
45-
:::image type="content" alt-text="Screenshot that shows deleting the app registration." source="./media/multi-service-web-app-clean-up-resources/delete-app-registration.png":::
4646

articles/active-directory/develop/quickstart-create-new-tenant.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ Many developers already have tenants through services or subscriptions that are
4747

4848
To check the tenant:
4949

50-
1. Sign in to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>. Use the account you'll use to manage your application.
50+
1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com) as at least a [Tenant Creator](../roles/permissions-reference.md#tenant-creator).
5151
1. Check the upper-right corner. If you have a tenant, you'll automatically be signed in. You see the tenant name directly under your account name.
5252
* Hover over your account name to see your name, email address, directory or tenant ID (a GUID), and domain.
5353
* If your account is associated with multiple tenants, you can select your account name to open a menu where you can switch between tenants. Each tenant has its own tenant ID.
5454

5555
> [!TIP]
5656
> To find the tenant ID, you can:
5757
> * Hover over your account name to get the directory or tenant ID.
58-
> * Search and select **Azure Active Directory** > **Overview** > **Tenant ID** in the Azure portal.
58+
> * Select **Identity** > **Overview** and look for **Tenant ID**.
5959
6060
If you don't have a tenant associated with your account, you'll see a GUID under your account name. You won't be able to do actions like registering apps until you create an Azure AD tenant.
6161

6262
### Create a new Azure AD tenant
6363

64-
If you don't already have an Azure AD tenant or if you want to create a new one for development, see [Create a new tenant in Azure AD](../fundamentals/create-new-tenant.md) or use the [directory creation experience](https://portal.azure.com/#create/Microsoft.AzureActiveDirectory) in the Azure portal. If you want to create a tenant for app testing, see [build a test environment](test-setup-environment.md).
64+
If you don't already have an Azure AD tenant or if you want to create a new one for development, see [Create a new tenant in Azure AD](../fundamentals/create-new-tenant.md). If you want to create a tenant for app testing, see [build a test environment](test-setup-environment.md).
6565

6666
You'll provide the following information to create your new tenant:
6767

articles/active-directory/develop/refresh-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The server can revoke refresh tokens because of a change in credentials, user ac
5656

5757
- [Access tokens in the Microsoft identity platform](access-tokens.md)
5858
- [ID tokens in the Microsoft identity platform](id-tokens.md)
59-
- [Invalidate refresh token](/powershell/module/microsoft.graph.beta.users.actions/invoke-mgbetainvalidateuserrefreshtoken?view=graph-powershell-beta)
59+
- [Invalidate refresh token](/powershell/module/microsoft.graph.beta.users.actions/invoke-mgbetainvalidatealluserrefreshtoken?view=graph-powershell-beta&preserve-view=true)
6060
- [Single sign-out](v2-protocols-oidc.md#single-sign-out)
6161

6262
## Next steps

0 commit comments

Comments
 (0)