From 83c61f91e3020dc91853f3038c50830773c5a4f7 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Wed, 14 Feb 2024 14:16:12 +0100
Subject: [PATCH] Update Shell Launcher configuration file

---
 .../create-shell-launcher-configuration.md    | 63 ++++++-------------
 ...ml.md => quickstart-shell-launcher-xml.md} |  2 +-
 ...t-assigned-access-restricted-experience.md |  4 +-
 .../kiosk/quickstart-shell-launcher-kiosk.md  |  2 +-
 4 files changed, 23 insertions(+), 48 deletions(-)
 rename windows/configuration/kiosk/includes/{quickstart-kiosk-xml.md => quickstart-shell-launcher-xml.md} (83%)

diff --git a/windows/configuration/kiosk/create-shell-launcher-configuration.md b/windows/configuration/kiosk/create-shell-launcher-configuration.md
index 1a7638fdf8..85e8160fc2 100644
--- a/windows/configuration/kiosk/create-shell-launcher-configuration.md
+++ b/windows/configuration/kiosk/create-shell-launcher-configuration.md
@@ -3,66 +3,41 @@ title: Create an Shell Launcher configuration file
 description: Learn how to create an XML file to configure a device with Shell Launcher.
 ms.date: 02/12/2024
 ms.topic: how-to
-zone_pivot_groups: windows-versions-11-10
-appliesto:
 ---
 
 # Create an Shell Launcher configuration file
 
 ## Full XML example
 
-::: zone pivot="windows-11"
 
 ```xml
-<?xml version="1.0" encoding="utf-8" ?>
-<AssignedAccessConfiguration xmlns="http://schemas.microsoft.com/AssignedAccess/2017/config"
-    xmlns:rs5="http://schemas.microsoft.com/AssignedAccess/201810/config"
-    xmlns:v2="http://schemas.microsoft.com/AssignedAccess/201810/config"
-    xmlns:v3="http://schemas.microsoft.com/AssignedAccess/2020/config"
-    xmlns:v5="http://schemas.microsoft.com/AssignedAccess/2022/config"
-    xmlns:win11="http://schemas.microsoft.com/AssignedAccess/2022/config">
+<?xml version="1.0" encoding="utf-8"?>
+<ShellLauncherConfiguration
+xmlns="http://schemas.microsoft.com/ShellLauncher/2018/Configuration"
+xmlns:v2="http://schemas.microsoft.com/ShellLauncher/2019/Configuration">
     <Profiles>
-        <Profile Id="{6954c40a-45dd-4176-a2e3-ecaf5c97f425}">
-            <AllAppsList>
-                <AllowedApps>
-                    <App AppUserModelId="Microsoft.WindowsCalculator_8wekyb3d8bbwe!App" />
-                    <App AppUserModelId="Microsoft.Windows.Photos_8wekyb3d8bbwe!App" />
-                    <App AppUserModelId="Microsoft.BingWeather_8wekyb3d8bbwe!App" />
-                    <App DesktopAppPath="C:\Windows\system32\cmd.exe" />
-                    <App DesktopAppPath="%windir%\System32\WindowsPowerShell\v1.0\Powershell.exe" />
-                </AllowedApps>
-            </AllAppsList>
-            <rs5:FileExplorerNamespaceRestrictions>
-                <rs5:AllowedNamespace Name="Downloads"/>
-                <v3:AllowRemovableDrives/>
-            </rs5:FileExplorerNamespaceRestrictions>
-            <win11:StartPins>
-                <![CDATA[{
-                    "pinnedList":[
-                        {"packagedAppId":"Microsoft.WindowsCalculator_8wekyb3d8bbwe!App"},
-                        {"packagedAppId":"Microsoft.Windows.Photos_8wekyb3d8bbwe!App"},
-                        {"packagedAppId":"Microsoft.BingWeather_8wekyb3d8bbwe!App"},
-                        {"desktopAppLink":"%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\System Tools\\Command Prompt.lnk"},
-                        {"desktopAppLink":"%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\Windows PowerShell\\Windows PowerShell.lnk"},
-                        {"desktopAppLink":"%APPDATA%\\Microsoft\\Windows\\Start Menu\\Programs\\File Explorer.lnk"},
-                        {"packagedAppId": "windows.immersivecontrolpanel_cw5n1h2txyewy!microsoft.windows.immersivecontrolpanel"},
-                        {"desktopAppLink": "%ALLUSERSPROFILE%\\Microsoft\\Windows\\Start Menu\\Programs\\Microsoft Edge.lnk"}
-                    ]
-                }]]>
-            </win11:StartPins>
-            <Taskbar ShowTaskbar="true"/>
+        <DefaultProfile>
+            <Shell Shell="%SystemRoot%\explorer.exe"/>
+        </DefaultProfile>
+        <Profile Id="{EDB3036B-780D-487D-A375-69369D8A8F78}">
+            <Shell Shell="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge.exe --kiosk https://maps.heathrow.com --edge-kiosk-type=fullscreen --kiosk-idle-timeout-minutes=2" v2:AppType="Desktop" v2:AllAppsFullScreen="true">
+                <ReturnCodeActions>
+                    <ReturnCodeAction ReturnCode="0" Action="RestartShell"/>
+                    <ReturnCodeAction ReturnCode="-1" Action="RestartDevice"/>
+                    <ReturnCodeAction ReturnCode="255" Action="ShutdownDevice"/>
+                </ReturnCodeActions>
+                <DefaultAction Action="RestartShell"/>
+            </Shell>
         </Profile>
     </Profiles>
     <Configs>
         <Config>
-            <AutoLogonAccount rs5:DisplayName="Library Kiosk"/>
-            <DefaultProfile Id="{9A2A490F-10F6-4764-974A-43B19E722C23}"/>
+            <AutoLogonAccount/>
+            <Profile Id="{EDB3036B-780D-487D-A375-69369D8A8F78}"/>
         </Config>
     </Configs>
-</AssignedAccessConfiguration>
+</ShellLauncherConfiguration>
 ```
-::: zone-end
-
 
 :::row:::
     :::column span="1":::
diff --git a/windows/configuration/kiosk/includes/quickstart-kiosk-xml.md b/windows/configuration/kiosk/includes/quickstart-shell-launcher-xml.md
similarity index 83%
rename from windows/configuration/kiosk/includes/quickstart-kiosk-xml.md
rename to windows/configuration/kiosk/includes/quickstart-shell-launcher-xml.md
index 31a97dba4e..77244e065f 100644
--- a/windows/configuration/kiosk/includes/quickstart-kiosk-xml.md
+++ b/windows/configuration/kiosk/includes/quickstart-shell-launcher-xml.md
@@ -16,7 +16,7 @@ xmlns:v2="http://schemas.microsoft.com/ShellLauncher/2019/Configuration">
             <Shell Shell="%SystemRoot%\explorer.exe"/>
         </DefaultProfile>
         <Profile Id="{EDB3036B-780D-487D-A375-69369D8A8F78}">
-            <Shell Shell="Microsoft.BingWeather_8wekyb3d8bbwe!App" v2:AppType="UWP" v2:AllAppsFullScreen="true">
+            <Shell Shell="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge.exe --kiosk https://maps.heathrow.com --edge-kiosk-type=fullscreen --kiosk-idle-timeout-minutes=2" v2:AppType="Desktop" v2:AllAppsFullScreen="true">
                 <ReturnCodeActions>
                     <ReturnCodeAction ReturnCode="0" Action="RestartShell"/>
                     <ReturnCodeAction ReturnCode="-1" Action="RestartDevice"/>
diff --git a/windows/configuration/kiosk/quickstart-assigned-access-restricted-experience.md b/windows/configuration/kiosk/quickstart-assigned-access-restricted-experience.md
index aad82b6c36..7e5c3c4d9b 100644
--- a/windows/configuration/kiosk/quickstart-assigned-access-restricted-experience.md
+++ b/windows/configuration/kiosk/quickstart-assigned-access-restricted-experience.md
@@ -1,5 +1,5 @@
 ---
-title: "Quickstart: Configure a restricted user experience"
+title: "Quickstart: Configure a restricted user experience with Assigned Access"
 description: Learn how to configure a restricted user experience using Windows Configuration Designer, Microsoft Intune, PowerShell or GPO.
 ms.topic: quickstart
 ms.date: 02/05/2024
@@ -7,7 +7,7 @@ appliesto:
 - ✅ <a href=/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
 ---
 
-# Quickstart: Configure a restricted user experience
+# Quickstart: Configure a restricted user experience with Assigned Access
 
 With a *restricted user experience*, you can control the applications allowed in a locked down Windows desktop.
 
diff --git a/windows/configuration/kiosk/quickstart-shell-launcher-kiosk.md b/windows/configuration/kiosk/quickstart-shell-launcher-kiosk.md
index 1de7311010..3e7733a183 100644
--- a/windows/configuration/kiosk/quickstart-shell-launcher-kiosk.md
+++ b/windows/configuration/kiosk/quickstart-shell-launcher-kiosk.md
@@ -44,7 +44,7 @@ Alternatively, you can configure devices using a [custom policy][MEM-1] with the
 - **Setting:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
 - **Value:**
 
-[!INCLUDE [quickstart-kiosk-xml](includes/quickstart-kiosk-xml.md)]
+[!INCLUDE [quickstart-shell-launcher-xml](includes/quickstart-shell-launcher-xml.md)]
 
 #### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps)