Skip to content

Commit 74b08b6

Browse files
authored
Merge branch 'main' into frankroj-patch-2
2 parents 910850d + 6e50bcb commit 74b08b6

14 files changed

+31
-44
lines changed

autopilot/requirements.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: frankroj
88
ms.author: frankroj
99
ms.reviewer: madakeva
1010
manager: aaroncz
11-
ms.date: 03/27/2025
11+
ms.date: 05/15/2025
1212
ms.collection:
1313
- M365-modern-desktop
1414
- highpri
@@ -68,6 +68,7 @@ The following editions of Windows 11 are supported:
6868
- Windows 11 Enterprise.
6969
- Windows 11 Education.
7070
- [Windows 11 Enterprise LTSC](/windows/whats-new/ltsc/overview).
71+
- Windows 11 IoT Enterprise only when used in Microsoft Teams Rooms devices.
7172
7273
#### Windows 10
7374
@@ -81,6 +82,7 @@ The following editions of Windows 10 are supported:
8182
- Windows 10 Enterprise.
8283
- Windows 10 Education.
8384
- [Windows 10 Enterprise LTSC](/windows/whats-new/ltsc/overview).
85+
- Windows 10 IoT Enterprise only when used in Microsoft Teams Rooms devices.
8486
8587
#### HoloLens
8688

intune/intune-service/apps/apps-supported-intune-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ The below apps support the Core Intune App Protection Policy settings and are al
9191
|Microsoft Planner|[iOS](https://apps.apple.com/us/app/microsoft-planner/id1219301037)||No settings||N/A|||N/A||
9292
|Microsoft PowerPoint|[Android](https://play.google.com/store/apps/details?id=com.microsoft.office.powerpoint)||No settings||N/A|||||
9393
|Microsoft PowerPoint|[iOS](https://apps.apple.com/us/app/microsoft-powerpoint/id586449534)||No settings||N/A|||||
94-
|Microsoft Remote Desktop|[Android](https://play.google.com/store/apps/details?id=com.microsoft.rdc.androidx)||||N/A|N/A|N/A|N/A||
95-
|Microsoft Windows App|[iOS](https://apps.apple.com/us/app/remote-desktop-mobile/id714464092)||✔ see [Configure device redirection](/azure/virtual-desktop/client-device-redirection-intune).||N/A|N/A|N/A|N/A||
94+
|Microsoft Windows App|[Android](https://play.google.com/store/apps/details?id=com.microsoft.rdc.androidx)|| see [Manage device redirection](/windows-app/manage-device-redirection-intune).||N/A|N/A|N/A|N/A||
95+
|Microsoft Windows App|[iOS](https://apps.apple.com/us/app/remote-desktop-mobile/id714464092)||✔ see [Manage device redirection](/windows-app/manage-device-redirection-intune).||N/A|N/A|N/A|N/A||
9696
|Microsoft SharePoint|[Android](https://play.google.com/store/apps/details?id=com.microsoft.sharepoint)||No settings||N/A|||N/A||
9797
|Microsoft SharePoint|[iOS](https://apps.apple.com/us/app/microsoft-sharepoint/id1091505266)||No settings||N/A|||N/A||
9898
|Microsoft Teams|[Android](https://play.google.com/store/apps/details?id=com.microsoft.teams)||No settings||N/A||||✔ Supported for v1416/1.0.0.2023226005 (2023226050) or later|

intune/intune-service/apps/apps-win32-prepare.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ ms.collection:
2828

2929
Before you can add a Win32 app to Microsoft Intune, you must prepare the app by using the [Microsoft Win32 Content Prep Tool](https://go.microsoft.com/fwlink/?linkid=2065730).
3030

31+
> [!TIP]
32+
> As a companion to this article, see our [‎Intune‎ app protection for ‎Windows‎ 10/11 setup guide](https://go.microsoft.com/fwlink/?linkid=2309605) to review best practices and learn to enforce policies, deploy apps, and protect corporate data across a variety of devices. For a customized experience based on your environment, you can access the [‎Intune‎ app protection for ‎Windows‎ 10/11 guide](https://go.microsoft.com/fwlink/?linkid=2309606) in the Microsoft 365 admin center.  
33+
3134
## Prerequisites
3235

3336
To use Win32 app management, be sure you meet the following criteria:

intune/intune-service/apps/mamedge-2-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Use the following steps to apply the data protection framework.
6363

6464
1. Navigate to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
6565

66-
2. Select **Apps** > **Protection** > **Create policy** > **Windows**.
66+
2. Select **Apps** > **Protection** > **Create** > **Windows**.
6767

6868
3. On the **Create policy** step, set the following details:
6969

@@ -141,7 +141,7 @@ Next, you create a **Level 3** app protection policy for Microsoft Edge from Mic
141141

142142
To create the app protection policy, follow these steps:
143143

144-
1. Navigate to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431) and select **Apps** > **Protection** > **Create policy**.
144+
1. Navigate to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431) and select **Apps** > **Protection** > **Create**.
145145

146146
2. Select **Create policy** > **Android** or **iOS/iPadOS**. Next, enter the following information:
147147

intune/intune-service/apps/quickstart-create-assign-app-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Sign in to the [Intune](https://aka.ms/intuneportal) as an [Intune administrator
5151

5252
Use the following steps to create an app protection policy:
5353

54-
1. In [Intune](https://aka.ms/intuneportal), select **Apps** > **Protection** > **Create Policy** > **Windows 10**.
54+
1. In [Intune](https://aka.ms/intuneportal), select **Apps** > **Protection** > **Create** > **Windows 10**.
5555
2. Enter the following details:
5656

5757
- **Name**: *Windows 10 content protection*

intune/intune-service/apps/windows-information-protection-policy-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ After you set up Intune in your organization, you can create a WIP-specific poli
8181
8282

8383
1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
84-
2. Select **Apps** > **Protection** > **Create policy**.
84+
2. Select **Apps** > **Protection** > **Create**.
8585
3. Add the following values:
8686
- **Name:** Type a name (required) for your new policy.
8787
- **Description:** (Optional) Type a description.

intune/intune-service/configuration/device-restrictions-android-aosp.md

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 04/15/2025
10+
ms.date: 05/14/2025
1111
ms.topic: reference
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -31,16 +31,14 @@ ms.collection:
3131

3232
# Android (AOSP) device settings to allow or restrict features using Templates in Intune
3333

34-
This article describes the different settings you can control on Android (AOSP) devices using Templates. You can use these restrictions to configure password requirements and access to device features.
34+
This article lists and describes the different settings you can configure on Android (AOSP) devices using templates in Microsoft Intune. Settings can be configured using **Templates** or the **[settings catalog](settings-catalog.md)**. This article focuses on the templates.
3535

36-
Settings can be configured either through **Templates** or **Settings catalog**. For more information on **Settings catalog**, go to [Settings catalog](settings-catalog.md).
37-
38-
The settings outlined below can be found as **Templates** under **Devices** > **Manage devices** > **Configuration** > **Create** > **New policy** > **Android Enterprise** > **Templates**.
36+
You can use these restrictions to configure password requirements and access to device features.
3937

4038
> [!NOTE]
4139
>
42-
>- If you can't find a setting in **Templates**, select **Settings catalog**. The settings catalog is a list of the settings you can configure for Android (AOSP) devices. It includes additional settings that you can configure that are not available under **Templates**.
43-
>- If you can't find a setting in **Settings catalog**, check **Templates**.
40+
>- If you can't find a setting in templates, then look for the setting in the settings catalog. It can include more settings that aren't available in templates. If you can't find a setting in the settings catalog, then look at the template settings.
41+
>- Device configuration profiles aren't supported on Microsoft Teams devices running AOSP.
4442
4543
This feature applies to:
4644

@@ -49,21 +47,9 @@ This feature applies to:
4947

5048
## Before you begin
5149

52-
1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
53-
2. Select **Devices** > **Manage devices** > **Configuration** > **Create** > **New policy**.
54-
3. Enter the following properties:
55-
56-
- **Platform**: Select **Android (AOSP)**.
57-
- **Profile type**: Select **Templates**.
58-
59-
4. Select **Create**.
60-
5. In **Basics**, enter the following properties:
61-
62-
- **Name**: Name your profiles so you can easily identify them later.
63-
- **Description**: This setting is optional but recommended.
64-
65-
6. Select **Next**.
66-
50+
- Create an [AOSP device restrictions profile](device-restrictions-configure.md).
51+
- For platform, select **Android (AOSP)**.
52+
- For profile type, select **Templates**
6753

6854
## Device password
6955

intune/intune-service/configuration/wi-fi-settings-windows.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: MandiOhlinger
88
ms.author: mandia
99
manager: dougeby
10-
ms.date: 06/25/2024
10+
ms.date: 05/15/2025
1111
ms.topic: reference
1212
ms.service: microsoft-intune
1313
ms.subservice: configuration
@@ -147,7 +147,7 @@ Enterprise profiles use Extensible Authentication Protocol (EAP) to authenticate
147147
- **EAP-TLS**: Also enter:
148148

149149
- **Certificate server names**: Enter one or more common names used in the certificates issued by your trusted certificate authority (CA). If you enter this information, you can bypass the dynamic trust dialog shown on user devices when they connect to this Wi-Fi network.
150-
- **Root certificates for server validation**: Select one or more existing trusted root certificate profiles. When the client connects to the network, these certificates are used to establish a chain of trust with the server. If your authentication server uses a public certificate, then you don't need to include a root certificate.
150+
- **Root certificates for server validation**: Select one or more existing trusted root certificate profiles. When the client connects to the network, these certificates are used to establish a chain of trust with the server. If your authentication server uses a public certificate that's already installed on your device, then you don't need to include a root certificate.
151151
- **Authentication method**: Select the authentication method used by your device clients. Your options:
152152

153153
- **SCEP certificate**: Select the SCEP client certificate profile that is also deployed to the device. This certificate is the identity presented by the device to the server to authenticate the connection.
@@ -157,7 +157,7 @@ Enterprise profiles use Extensible Authentication Protocol (EAP) to authenticate
157157
- **EAP-TTLS**: Also enter:
158158

159159
- **Certificate server names**: Enter one or more common names used in the certificates issued by your trusted certificate authority (CA). If you enter this information, you can bypass the dynamic trust dialog shown on user devices when they connect to this Wi-Fi network.
160-
- **Root certificates for server validation**: Select one or more existing trusted root certificate profiles. When the client connects to the network, these certificates are used to establish a chain of trust with the server. If your authentication server uses a public certificate, then you don't need to include a root certificate.
160+
- **Root certificates for server validation**: Select one or more existing trusted root certificate profiles. When the client connects to the network, these certificates are used to establish a chain of trust with the server. If your authentication server uses a public certificate that's already installed on your device, then you don't need to include a root certificate.
161161
- **Authentication method**: Select the authentication method used by your device clients. Your options:
162162

163163
- **Username and Password**: Prompt the user for a user name and password to authenticate the connection. Also enter:
@@ -181,7 +181,7 @@ Enterprise profiles use Extensible Authentication Protocol (EAP) to authenticate
181181

182182
- **Certificate server names**: Enter one or more common names used in the certificates issued by your trusted certificate authority (CA). If you enter this information, you can bypass the dynamic trust dialog shown on user devices when they connect to this Wi-Fi network.
183183

184-
- **Root certificates for server validation**: Select one or more existing trusted root certificate profiles. When the client connects to the network, these certificates are used to establish a chain of trust with the server. If your authentication server uses a public certificate, then you don't need to include a root certificate.
184+
- **Root certificates for server validation**: Select one or more existing trusted root certificate profiles. When the client connects to the network, these certificates are used to establish a chain of trust with the server. If your authentication server uses a public certificate that's already installed on your device, then you don't need to include a root certificate.
185185

186186
- **Perform server validation**: When set to **Yes**, in PEAP negotiation phase 1, devices validate the certificate, and verify the server. Select **No** to block or prevent this validation. When set to **Not configured**, Intune doesn't change or update this setting.
187187

intune/intune-service/enrollment/android-aosp-corporate-owned-user-associated-enroll.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Create an enrollment profile to enable enrollment on devices.
7979
If you select **WEP Pre-shared key** or **WPA Pre-shared key**, also enter:
8080

8181
- **Pre-shared key**: The pre-shared key that's used to authenticate with the network.
82-
- **For Microsoft Teams devices (preview)**: Select **Enabled** if this profile is applicable for Microsoft Teams Android devices. This setting should only be used for [Microsoft Teams Android devices](/microsoftteams/devices/teams-ip-phones).
82+
- **For Microsoft Teams devices**: Select **Enabled** if this profile is applicable for Microsoft Teams Android devices. This setting should only be used for [Microsoft Teams Android devices](/microsoftteams/devices/teams-ip-phones). You can enable this setting in one enrollment profile per tenant.
8383

8484
7. Select **Next** and optionally, select scope tags.
8585
8. Select **Next**. Review the details of your profile and then select **Create** to save the profile.

intune/intune-service/fundamentals/intune-endpoints.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ keywords:
88
author: Smritib17
99
ms.author: smbhardwaj
1010
manager: dougeby
11-
ms.date: 04/01/2025
11+
ms.date: 05/21/2025
1212
ms.topic: reference
1313
ms.service: microsoft-intune
1414
ms.subservice: fundamentals
@@ -103,7 +103,7 @@ ID |Desc |Category |ER |Addresses |Ports
103103
97 | Consumer Outlook.com, OneDrive, Device authentication and Microsoft account | Default<BR>Required | False | `account.live.com`<BR>`login.live.com`<BR> |**TCP:** 443 |
104104
190 | Endpoint discovery | Default<BR>Required | False | `go.microsoft.com` | **TCP:** 80, 443|
105105
189 | Dependency - Feature Deployment| Default<BR>Required | False |`config.edge.skype.com`<BR>`ecs.office.com`<BR> | **TCP:** 443|
106-
192 | Organizational messages| Default<BR>Required | False | `fd.api.orgmsg.microsoft.com`<BR>`ris.prod.api.personalization.ideas.microsoft.com`<BR>`contentauthassetscdn-prod.azureedge.net`<BR>`contentauthassetscdn-prodeur.azureedge.net`<BR>`contentauthrafcontentcdn-prod.azureedge.net`<BR>`contentauthrafcontentcdn-prodeur.azureedge.net`<BR> | **TCP:** 443|
106+
192 | Organizational messages| Default<BR>Required | False | `fd.api.orgmsg.microsoft.com`<BR>`ris.prod.api.personalization.ideas.microsoft.com`<BR>` | **TCP:** 443|
107107

108108
### Windows Autopilot dependencies
109109

@@ -270,10 +270,6 @@ You'll also need FQDNs that are covered as part of Microsoft 365 Requirements. F
270270
|lgmsapeweu.blob.core.windows.net | Collect Diagnostics |
271271
|fd.api.orgmsg.microsoft.com | Organizational messages |
272272
|ris.prod.api.personalization.ideas.microsoft.com | Organizational messages |
273-
|contentauthassetscdn-prod.azureedge.net | Organizational messages |
274-
|contentauthassetscdn-prodeur.azureedge.net | Organizational messages |
275-
|contentauthrafcontentcdn-prod.azureedge.net | Organizational messages |
276-
|contentauthrafcontentcdn-prodeur.azureedge.net | Organizational messages |
277273
|config.edge.skype.com | Feature Deployment |
278274
|go.microsoft.com | Endpoint discovery |
279275

0 commit comments

Comments
 (0)