From 9f19734d066695fe4f6dad8b150e755d164cc804 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 16 Feb 2024 08:05:02 +0100
Subject: [PATCH] Update Assigned Access XSD for Windows 11, version 22H2 and
Windows 11, version 21H2 additions. Remove deprecated Shell Launcher
configuration file. Update TOC.yml with new links.
---
...osk-single-app.md => _kiosk-single-app.md} | 0
...l-signage.md => _setup-digital-signage.md} | 0
.../kiosk/assigned-access-xsd.md | 4 +-
.../create-shell-launcher-configuration.md | 135 ------------------
.../kiosk/shell-launcher-examples.md | 39 +++++
windows/configuration/kiosk/toc.yml | 12 +-
6 files changed, 46 insertions(+), 144 deletions(-)
rename windows/configuration/kiosk/{kiosk-single-app.md => _kiosk-single-app.md} (100%)
rename windows/configuration/kiosk/{setup-digital-signage.md => _setup-digital-signage.md} (100%)
delete mode 100644 windows/configuration/kiosk/create-shell-launcher-configuration.md
create mode 100644 windows/configuration/kiosk/shell-launcher-examples.md
diff --git a/windows/configuration/kiosk/kiosk-single-app.md b/windows/configuration/kiosk/_kiosk-single-app.md
similarity index 100%
rename from windows/configuration/kiosk/kiosk-single-app.md
rename to windows/configuration/kiosk/_kiosk-single-app.md
diff --git a/windows/configuration/kiosk/setup-digital-signage.md b/windows/configuration/kiosk/_setup-digital-signage.md
similarity index 100%
rename from windows/configuration/kiosk/setup-digital-signage.md
rename to windows/configuration/kiosk/_setup-digital-signage.md
diff --git a/windows/configuration/kiosk/assigned-access-xsd.md b/windows/configuration/kiosk/assigned-access-xsd.md
index 03e835baa3..14c16526a9 100644
--- a/windows/configuration/kiosk/assigned-access-xsd.md
+++ b/windows/configuration/kiosk/assigned-access-xsd.md
@@ -210,7 +210,7 @@ The following is the XSD for Assigned Access in Windows 11:
```
-## Windows 11 additions
+## Windows 11, version 22H2 additions
The following is the XSD for Assigned Access features added in Windows 11:
@@ -230,7 +230,7 @@ The following is the XSD for Assigned Access features added in Windows 11:
```
-## Windows 10, version 21H2 additions
+## Windows 11, version 21H2 additions
The following is the XSD for Assigned Access features added in Windows 10, version 21H2:
diff --git a/windows/configuration/kiosk/create-shell-launcher-configuration.md b/windows/configuration/kiosk/create-shell-launcher-configuration.md
deleted file mode 100644
index 47cc813294..0000000000
--- a/windows/configuration/kiosk/create-shell-launcher-configuration.md
+++ /dev/null
@@ -1,135 +0,0 @@
----
-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
----
-
-# Create an Shell Launcher configuration file
-
-## Full XML example
-
-
-```xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-```
-
-:::row:::
- :::column span="1":::
- **Scenario**
- :::column-end:::
- :::column span="3":::
- **Sample Xml**
- :::column-end:::
-:::row-end:::
-:::row:::
- :::column span="1":::
- **Block everything**
- :::column-end:::
- :::column span="3":::
- Either don't use the node or leave it empty
-
- ```xml
-
-
- ```
- :::column-end:::
-:::row-end:::
-:::row:::
- :::column span="1":::
- **Only allow downloads**
- :::column-end:::
- :::column span="3":::
- ```xml
-
-
-
- ```
- :::column-end:::
-:::row-end:::
-
-:::row:::
- :::column span="1":::
- **Only allow removable drives**
- :::column-end:::
- :::column span="3":::
- ```xml
-
-
-
- ```
- :::column-end:::
-:::row-end:::
-
-:::row:::
- :::column span="1":::
- **Allow both Downloads, and removable drives**
- :::column-end:::
- :::column span="3":::
- ```xml
-
-
-
-
- ```
- :::column-end:::
-:::row-end:::
-
-:::row:::
- :::column span="1":::
- **No restrictions, all locations are allowed**
- :::column-end:::
- :::column span="3":::
- ```xml
-
-
-
- ```
- :::column-end:::
-:::row-end:::
-
-
diff --git a/windows/configuration/kiosk/shell-launcher-examples.md b/windows/configuration/kiosk/shell-launcher-examples.md
new file mode 100644
index 0000000000..a50ca9e6c4
--- /dev/null
+++ b/windows/configuration/kiosk/shell-launcher-examples.md
@@ -0,0 +1,39 @@
+---
+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
+---
+
+# Shell Launcher configuration XML examples
+
+This article provides practical examples of Shell Launcher XML configuration files.
+
+For more details, review the Shell Launcher XSD reference article.
+
+## Kiosk example
+
+[!INCLUDE [shell-launcher-quickstart-xml](includes/shell-launcher-quickstart-xml.md)]
+
+
+
+
diff --git a/windows/configuration/kiosk/toc.yml b/windows/configuration/kiosk/toc.yml
index ef685e1663..6fc6ba670b 100644
--- a/windows/configuration/kiosk/toc.yml
+++ b/windows/configuration/kiosk/toc.yml
@@ -15,12 +15,6 @@ items:
href: kiosk-prepare.md
- name: Guidelines for choosing an app for assigned access
href: guidelines-for-assigned-access-app.md
-- name: Deployment guides
- items:
- - name: Configure digital signs
- href: setup-digital-signage.md
- - name: Configure a kiosk
- href: kiosk-single-app.md
- name: How-to guides
items:
- name: Create an Assigned Access configuration file
@@ -54,4 +48,8 @@ items:
- name: _lock-down-windows-10-to-specific-apps
href: _lock-down-windows-10-to-specific-apps.md
- name: _lock-down-windows-11-to-specific-apps
- href: _lock-down-windows-11-to-specific-apps.md
\ No newline at end of file
+ href: _lock-down-windows-11-to-specific-apps.md
+ - name: _setup-digital-signage
+ href: _setup-digital-signage.md
+ - name: _kiosk-single-app
+ href: _kiosk-single-app.md
\ No newline at end of file