Merge pull request #6796 from MicrosoftDocs/main

Publish main to live, 09/10, 11:00 AM IST

.openpublishing.redirection.json

@@ -1229,6 +1229,16 @@
       "source_path": "migration/file-versions.md",
       "redirect_url": "/sharepointmigration/migrate-to-sharepoint-online",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "sharepoint/sharepointonline/onedrive-in-horizon-virtual-apps-deployment-guide.md",
+      "redirect_url": "/sharepoint/sync-vdi-support",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "sharepoint/sharepointonline/onedrive-in-citrix-virtual-apps-deployment-guide.md",
+      "redirect_url": "/sharepoint/sync-vdi-support",
+      "redirect_document_id": false
     }
   ]
 }

SharePoint/SharePointOnline/deploy-and-configure-on-macos.md

@@ -129,6 +129,8 @@ Use the following keys to preconfigure or change settings for your users. The ke
 
 ## List of settings
 
+- [AddedFolderHardDeleteOnUnmount](deploy-and-configure-on-macos.md#addedfolderharddeleteonunmount)
+- [AddedFolderUnmountOnPermissionsLoss](deploy-and-configure-on-macos.md#addedfolderunmountonpermissionsloss)
 - [AllowTenantList](deploy-and-configure-on-macos.md#allowtenantlist)
 - [AutomaticUploadBandwidthPercentage](deploy-and-configure-on-macos.md#automaticuploadbandwidthpercentage)
 - [BlockExternalSync](deploy-and-configure-on-macos.md#blockexternalsync)
@@ -159,6 +161,32 @@ Use the following keys to preconfigure or change settings for your users. The ke
 - [Tier](deploy-and-configure-on-macos.md#tier)
 - [UploadBandwidthLimited](deploy-and-configure-on-macos.md#uploadbandwidthlimited)
 
+### AddedFolderHardDeleteOnUnmount
+
+This setting will control the contents of the folder when an unmount of an Added Folder is detected.
+
+Set the setting's value to **True**, to hard-delete all the contents of the folder when an unmount of an Added Folder is received. Set the value to **False** or don't enable the setting to move the contents of the unmounted folder to the recycle-bin by default.
+
+The example for this setting in the .plist file is:
+
+```xml
+<key>AddedFolderHardDeleteOnUnmount</key>
+<(Bool)/>
+```
+
+### AddedFolderUnmountOnPermissionsLoss
+
+This setting will control the contents of the folder and the folder itself when the Sync client detects that the user lost permissions to an Added Folder.
+
+Set the setting's value to **True**, to hard-delete all the contents of the folder and the folder itself when the Sync client detects that the user lost permissions to an Added Folder. Set the value to **False** or don't enable the setting to efault mark the folder in error and prompt the user to remove it. When the user confirms the removals, the contents of the folder are moved to the recycle-bin.
+
+The example for this setting in the .plist file is:
+
+```xml
+<key>AddedFolderUnmountOnPermissionsLoss</key>
+<(Bool)/>
+```
+
 ### AllowTenantList
 
 This setting prevents the users from uploading files to other organizations by specifying a list of allowed tenant IDs. If you enable this setting, the user gets an error if they attempt to add an account from an organization that isn't in the allowed tenants list. If the user is already added the account, the files stop syncing. This setting takes priority over the **BlockTenantList** setting. Do **NOT** enable both settings at the same time.

SharePoint/SharePointOnline/sync-vdi-support.md

@@ -1,5 +1,5 @@
 ---
-ms.date: 04/11/2024
+ms.date: 09/09/2024
 title: "Use the sync app on virtual desktops"
 ms.reviewer: kafeaver
 ms.author: mactra
@@ -33,7 +33,6 @@ For all [supported operating systems](https://support.office.com/article/cc0cb2b
 - Non-persistent virtual desktops that have [FSLogix Apps](/fslogix/configure-profile-container-tutorial) or [FSLogix Office Container](/fslogix/configure-office-container-tutorial), and a Microsoft 365 subscription for all of the following operating systems:
   - Windows 10 and 11, 32-bit or 64-bit (supports VMDK files)
   - Windows Server 2022 (supports VHDX)
-
   - Windows Server 2019 (supports VHDX)
   - Windows Server 2016 (supports VHDX)
   - Windows Server 2012 R2 (supports VHDX)
@@ -48,10 +47,65 @@ For all [supported operating systems](https://support.office.com/article/cc0cb2b
 >
 > For Windows Server, the [SMB network file sharing protocol](/windows-server/storage/file-server/file-server-smb-overview) is also required.
 >
-> The OneDrive sync app is supported in a remote app scenario hosted as a [Citrix Virtual App](onedrive-in-citrix-virtual-apps-deployment-guide.md).
+> The OneDrive sync app is supported in a remote app scenario hosted as a Citrix Virtual App.
 >
 > The OneDrive sync app with FSLogix does not support running multiple instances of the same container simultaneously.
 
+## Set up OneDrive in Citrix Virtual Apps
+
+This article describes how to enable and use OneDrive in Citrix Virtual Apps.
+
+### Prerequisites
+
+To enable OneDrive in Citrix Virtual Apps, you must have the following versions of Windows and Citrix Virtual Apps and Desktops (CVAD):
+
+**Windows**:
+
+- Windows 11: KB5014019
+- Windows Server 2022: KB5014021
+- Windows 10: KB5014023
+- Windows Server 2019: KB5014022
+
+**Citrix**:
+
+- CVAD 7 2203 LTSR CU1 or later.
+- VDA 2212 enables Shellbridge by default. All earlier versions require Shellbridge to be enabled manually.
+- To enable this feature, On 2203 LTSR TS VDA (2019 Server, 2022 Server, Windows 10 RDSH, or Windows 11 RDSH) add the following registry details:
+
+    `HKEY_LOCAL_MACHINE\SOFTWARE\Citrix\Citrix Virtual Desktop Agent`<p>
+    `Name: Shellbridge`<p>
+    `Type: REG_DWORD`<p>
+    `Value: 1`
+
+To ensure that the feature is correctly enabled, open a command window (cmd.exe) and run `start ms-settings:printers`. If the feature is enabled, the printer setting window is displayed.
+
+**We recommend adding OneDrive.exe to `LogoffCheckSysModules`**.
+
+   `HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Citrix\wfshell\TWI` <p>
+   `Value Name:LogoffCheckSysModules` <p>
+   `Type:REG_SZ` <p>
+   `String:OneDrive.exe, Microsoft.Sharepoint.exe` <p>
+
+> [!IMPORTANT]
+> [FSLogix](/fslogix/how-to-install-fslogix) must be used in conjunction with Citrix Virtual Apps for OneDrive to be supported.
+
+### How to set up OneDrive
+
+1. Install OneDrive Sync app per machine. See [Install the sync app per-machine](per-machine-installation.md).
+1. Install the latest version of FSLogix. See [Install FSLogix Applications](/fslogix/how-to-install-fslogix).
+
+    > [!NOTE]
+    > All non-persistent VDI environments require the latest version of FSLogix. Ensure you install the latest version. See [OneDrive sync error FSLogix_unsupported_environment on VMs](/sharepoint/troubleshoot/sync/fslogix-unsupported-environment-sync-error-vm).
+
+1. Add OneDrive to `HKLM\Software\Microsoft\Windows\CurrentVersion\` by using the following command:
+
+    `REG ADD HKLM\Software\Microsoft\Windows\CurrentVersion\Run /v OneDrive /t REG_SZ /d "\"C:\Program Files\Microsoft OneDrive\OneDrive.exe\" /background"`
+
+1. Silently configure user accounts. See [Silently configure user accounts](use-silent-account-configuration.md).
+
+    > [!NOTE]
+    > Silent sign-in should work if your machine is connected to Microsoft Entra ID. Make sure to turn off this setting if your computer is not Microsoft Entra joined.
+
 ## See also
 
 Learn more about [VHDX](/openspecs/windows_protocols/ms-vhdx/83f6b700-6216-40f0-aa99-9fcb421206e2) and [VHD](/windows/desktop/vstor/about-vhd).

SharePoint/SharePointOnline/toc.yml

@@ -1,4 +1,4 @@
-Items:
+items:
 - name: SharePoint and OneDrive
   href: introduction.md
   items:
@@ -316,10 +316,6 @@ Items:
         href: deploy-on-windows.md
       - name: Per-machine installation
         href: per-machine-installation.md
-      - name: OneDrive in Citrix Virtual Apps
-        href: onedrive-in-citrix-virtual-apps-deployment-guide.md
-      - name: OneDrive in Horizon Virtual apps
-        href: onedrive-in-horizon-virtual-apps-deployment-guide.md
     - name: Sync app options
       items:
       - name: Sync on virtual desktops