diff --git a/windows/configuration/assigned-access/assigned-access-quickstart-restricted-experience.md b/windows/configuration/assigned-access/assigned-access-quickstart-restricted-experience.md index aaf37ec3bd..5e8f3bdc34 100644 --- a/windows/configuration/assigned-access/assigned-access-quickstart-restricted-experience.md +++ b/windows/configuration/assigned-access/assigned-access-quickstart-restricted-experience.md @@ -36,7 +36,13 @@ The examples can be modified to fit your specific requirements. For example, you > > When using this call, authenticate to your tenant in the Graph Explorer window. If it's the first time using Graph Explorer, you may need to authorize the application to access your tenant or to modify the existing permissions. This graph call requires *DeviceManagementConfiguration.ReadWrite.All* permissions. -[!INCLUDE [assigned-access-quickstart-restricted-experience-intune](includes/assigned-access-quickstart-restricted-experience-intune.md)] +::: zone pivot="windows-11" +[!INCLUDE [assigned-access-quickstart-restricted-experience-intune-11.md](includes/assigned-access-quickstart-restricted-experience-intune-11.md)] +::: zone-end + +::: zone pivot="windows-10" +[!INCLUDE [assigned-access-quickstart-restricted-experience-intune-10.md](includes/assigned-access-quickstart-restricted-experience-intune-10.md)] +::: zone-end [!INCLUDE [intune-custom-settings-2](../../../includes/configure/intune-custom-settings-2.md)] @@ -45,7 +51,13 @@ Alternatively, you can configure devices using a [custom policy][MEM-1] with the - **Setting:** `./Vendor/MSFT/AssignedAccess/Configuration` - **Value:** -[!INCLUDE [assigned-access-quickstart-restricted-experience-xml.md](includes/assigned-access-quickstart-restricted-experience-xml.md)] +::: zone pivot="windows-11" +[!INCLUDE [assigned-access-quickstart-restricted-experience-xml-11.md](includes/assigned-access-quickstart-restricted-experience-xml-11.md)] +::: zone-end + +::: zone pivot="windows-10" +[!INCLUDE [assigned-access-quickstart-restricted-experience-xml-10.md](includes/assigned-access-quickstart-restricted-experience-xml-10.md)] +::: zone-end #### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg) @@ -54,7 +66,13 @@ Alternatively, you can configure devices using a [custom policy][MEM-1] with the - **Path:** `AssignedAccess/MultiAppAssignedAccessSettings` - **Value:** -[!INCLUDE [assigned-access-quickstart-restricted-experience-xml.md](includes/assigned-access-quickstart-restricted-experience-xml.md)] +::: zone pivot="windows-11" +[!INCLUDE [assigned-access-quickstart-restricted-experience-xml-11.md](includes/assigned-access-quickstart-restricted-experience-xml-11.md)] +::: zone-end + +::: zone pivot="windows-10" +[!INCLUDE [assigned-access-quickstart-restricted-experience-xml-10.md](includes/assigned-access-quickstart-restricted-experience-xml-10.md)] +::: zone-end [!INCLUDE [provisioning-package-2](../../../includes/configure/provisioning-package-2.md)] @@ -62,7 +80,13 @@ Alternatively, you can configure devices using a [custom policy][MEM-1] with the [!INCLUDE [powershell-wmi-bridge-1](../../../includes/configure/powershell-wmi-bridge-1.md)] -[!INCLUDE [assigned-access-quickstart-restricted-experience-ps](includes/assigned-access-quickstart-restricted-experience-ps.md)] +::: zone pivot="windows-11" +[!INCLUDE [assigned-access-quickstart-restricted-experience-ps-11.md](includes/assigned-access-quickstart-restricted-experience-ps-11.md)] +::: zone-end + +::: zone pivot="windows-10" +[!INCLUDE [assigned-access-quickstart-restricted-experience-ps-10.md](includes/assigned-access-quickstart-restricted-experience-ps-10.md)] +::: zone-end [!INCLUDE [powershell-wmi-bridge-2](../../../includes/configure/powershell-wmi-bridge-2.md)] diff --git a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune.md b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune-10.md similarity index 100% rename from windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune.md rename to windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune-10.md diff --git a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune-11.md b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune-11.md new file mode 100644 index 0000000000..cf10c46e0a --- /dev/null +++ b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-intune-11.md @@ -0,0 +1,14 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 02/05/2024 +ms.topic: include +ms.prod: windows-client +--- + +```msgraph-interactive +POST https://graph.microsoft.com/beta/deviceManagement/deviceConfigurations +Content-Type: application/json + +{ "id": "00-0000-0000-0000-000000000000", "displayName": "_MSLearn_Example", "description": "Collection of settings for Assigned Access", "roleScopeTagIds": [ "0" ], "@odata.type": "#microsoft.graph.windows10CustomConfiguration", "omaSettings": [ { "@odata.type": "#microsoft.graph.omaSettingString", "displayName": "AssignedAccess_Configuration", "description": null, "omaUri": "./Vendor/MSFT/AssignedAccess/Configuration", "secretReferenceValueId": null, "isEncrypted": true, "value": "\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n" } ] } +``` \ No newline at end of file diff --git a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps.md b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps-10.md similarity index 82% rename from windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps.md rename to windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps-10.md index 5c387b63c4..8e9345b7ff 100644 --- a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps.md +++ b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps-10.md @@ -13,7 +13,6 @@ $assignedAccessConfiguration = @" xmlns="http://schemas.microsoft.com/AssignedAccess/2017/config" xmlns:rs5="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" > @@ -56,20 +55,6 @@ $assignedAccessConfiguration = @" ]]> - - - diff --git a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps-11.md b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps-11.md new file mode 100644 index 0000000000..fdf12e7a24 --- /dev/null +++ b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-ps-11.md @@ -0,0 +1,94 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 02/05/2024 +ms.topic: include +ms.prod: windows-client +--- + +```powershell +$assignedAccessConfiguration = @" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +"@ + +$eventLogFilterHashTable = @{ + ProviderName = "Microsoft-Windows-AssignedAccess"; + StartTime = Get-Date -Millisecond 0 +} + +$namespaceName="root\cimv2\mdm\dmmap" +$className="MDM_AssignedAccess" +$obj = Get-CimInstance -Namespace $namespaceName -ClassName $className +$obj.Configuration = [System.Net.WebUtility]::HtmlEncode($assignedAccessConfiguration) +$obj = Set-CimInstance -CimInstance $obj -ErrorVariable cimSetError -ErrorAction SilentlyContinue +if($cimSetError) { + Write-Output "An ERROR occurred. Displaying error record and attempting to retrieve error logs...`n" + Write-Error -ErrorRecord $cimSetError[0] + + $timeout = New-TimeSpan -Seconds 30 + $stopwatch = [System.Diagnostics.Stopwatch]::StartNew() + do{ + $events = Get-WinEvent -FilterHashtable $eventLogFilterHashTable -ErrorAction Ignore + } until ($events.Count -or $stopwatch.Elapsed -gt $timeout) # wait for the log to be available + + if($events.Count) { + $events | ForEach-Object { + Write-Output "$($_.TimeCreated) [$($_.LevelDisplayName.ToUpper())] $($_.Message -replace "`n|`r")" + } + } else { + Write-Warning "Timed-out attempting to retrieve event logs..." + } + + Exit 1 +} + +Write-Output "Successfully applied Assigned Access configuration" +``` \ No newline at end of file diff --git a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml-10.md b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml-10.md new file mode 100644 index 0000000000..c5345a4cc8 --- /dev/null +++ b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml-10.md @@ -0,0 +1,70 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 02/05/2024 +ms.topic: include +ms.prod: windows-client +--- + +```xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + +``` diff --git a/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml.md b/windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml-11.md similarity index 100% rename from windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml.md rename to windows/configuration/assigned-access/includes/assigned-access-quickstart-restricted-experience-xml-11.md diff --git a/windows/configuration/assigned-access/shell-launcher-quickstart-kiosk.md b/windows/configuration/assigned-access/shell-launcher-quickstart-kiosk.md index 4d6192e6bd..4fa5834b8a 100644 --- a/windows/configuration/assigned-access/shell-launcher-quickstart-kiosk.md +++ b/windows/configuration/assigned-access/shell-launcher-quickstart-kiosk.md @@ -3,8 +3,6 @@ title: "Quickstart: configure a kiosk experience with Shell Launcher" description: Learn how to configure a kiosk experience with Shell Launcher, using Windows Configuration Designer, Microsoft Intune, or PowerShell. ms.topic: quickstart ms.date: 02/05/2024 -appliesto: -- ✅ Windows 11 --- # Quickstart: configure a kiosk experience with Shell Launcher