Skip to content

Commit

Permalink
Merge pull request #15995 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
Publish main to live, Monday 10:30AM PDT, 08/26
  • Loading branch information
Stacyrch140 authored Aug 26, 2024
2 parents 26887c8 + 16804fb commit a9b7f80
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
3 changes: 3 additions & 0 deletions memdocs/intune/apps/apps-win32-add.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ On the **Program** page, configure the app installation and removal commands for

`msiexec /x "{12345A67-89B0-1234-5678-000001000000}"`

> [!NOTE]
> Environment variable expansion within the **Uninstall command** is not supported. If you require the use of environment variables, use a custom wrapper script within your Win32 package to wrap the appropriate command and use this script for the **Uninstall command**.
- **Installation time required**: The number of minutes the system will wait for install program to finish. Default value is 60 minutes. If the app takes longer to install than the set installation time, the system will fail the app install. Max timeout value is 1440 minutes (1 day).

- **Allow available uninstall**: Select **Yes** to provide the uninstall option for this app for users from the Company Portal. Select **No** to prevent users from uninstalling the app from the Company Portal.
Expand Down
2 changes: 1 addition & 1 deletion memdocs/intune/apps/macos-unmanaged-pkg.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ You can optionally configure a preinstall script and a post-install script to cu
**Post-install script**: Provide a script that runs after the app installs successfully. If provided, the post-install script runs after a successful app installation. Irrespective of the post-install script run status, an installed app reports its installation status as "success".

> [!NOTE]
> - Each pre-install or post-install script must be less than 5121 characters long.
> - Each pre-install or post-install script must be less than 15360 characters long.
> - The Microsoft Intune management agent for macOS version 2309.007 or greater is required to configure pre-install and post-install scripts for macOS PKG apps.
> - For more details on configuring pre-install and post-install scripts, refer to [Prerequisites of shell scripts](../apps/macos-shell-scripts.md#prerequisites).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ Windows 10 or Windows 11 Administrative Templates are supported for Windows 10 o
- ADMX-backed policies are supported. Some policies aren't yet available in the Settings catalog.
- ADMX-ingested policies are supported, including Office and Microsoft Edge settings available in Office administrative template files and Microsoft Edge administrative template files. For a complete list of ADMX-ingested policy categories, see [Win32 and Desktop Bridge app policy configuration](/windows/client-management/mdm/win32-and-centennial-app-policy-configuration#overview). Some ADMX ingested settings won't be applicable to Windows 10 or Windows 11 Enterprise multi-session.

To list supported Administrative Templates, you'll need to use the filter in Settings catalog.

## Compliance and Conditional access

You can secure your Windows 10 or Windows 11 Enterprise multi-session VMs by configuring compliance policies and Conditional Access policies in the Microsoft Intune admin center. The following compliance policies are supported on Windows 10 or Windows 11 Enterprise multi-session VMs:
Expand Down
2 changes: 1 addition & 1 deletion memdocs/intune/fundamentals/whats-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords:
author: brenduns
ms.author: brenduns
manager: dougeby
ms.date: 08/19/2024
ms.date: 08/23/2024
ms.topic: conceptual
ms.service: microsoft-intune
ms.subservice: fundamentals
Expand Down
4 changes: 2 additions & 2 deletions windows-365/enterprise/device-images-convert-generation-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keywords:
author: ErikjeMS
ms.author: erikje
manager: dougeby
ms.date: 06/15/2023
ms.date: 08/26/2024
ms.topic: how-to
ms.service: windows-365
ms.subservice: windows-365-enterprise
Expand Down Expand Up @@ -44,7 +44,7 @@ There are four main steps to this process:

## Create a new virtual machine

1. Make sure that Hyper-V is installed on your management PC. For information on how to install Hyper-V, see [Install Hyper-V on Windows 10](/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v).
1. Make sure that Hyper-V is installed on your management PC. For information on how to install Hyper-V, see [Install Hyper-V on Windows](/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v).
2. Download your existing custom image virtual hard drive (VHD) file from the Azure storage blob URL to your PC where you have Hyper-V available.
The VHD file is the exact size of the OS disk, which can be a large file size. Make sure to use a fast, stable internet connection to download the VHD file, and prepare for long download times.
For information on how to download a managed disk, see [Download a VHD from Azure](/azure/virtual-machines/windows/download-vhd#generate-download-url).
Expand Down

0 comments on commit a9b7f80

Please sign in to comment.