From 8985def026fd5423b34de35df5dab58560e02982 Mon Sep 17 00:00:00 2001 From: Frank Rojas <45807133+frankroj@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:21:44 -0500 Subject: [PATCH] Add new MFA features for Windows Subscription Activation --- .../deployment/deploy-enterprise-licenses.md | 8 +++---- .../windows-subscription-activation.md | 22 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/windows/deployment/deploy-enterprise-licenses.md b/windows/deployment/deploy-enterprise-licenses.md index 850a99b17f..8fb74ce020 100644 --- a/windows/deployment/deploy-enterprise-licenses.md +++ b/windows/deployment/deploy-enterprise-licenses.md @@ -11,7 +11,7 @@ ms.topic: how-to ms.collection: - highpri - tier2 -ms.date: 02/13/2024 +ms.date: 02/15/2024 zone_pivot_groups: windows-versions-11-10 appliesto: - ✅ Windows 11 @@ -368,11 +368,11 @@ In some instances, users might experience problems with activation of the Window - The Windows Enterprise E3 or E5 subscription has lapsed, was removed, or isn't applied. - Windows Pro was never activated. -When there are problems with Windows Enterprise E3 or E5 subscription activation, the following are errors can occur in the [Activation](ms-settings:activation) pane: +When there are problems with Windows Enterprise E3 or E5 subscription activation, the following are errors can occur in the [**Activation**](ms-settings:activation) pane: - **Windows Pro isn't activated** - When Windows Pro isn't activated on a device, the following message is displayed for **Activation** in the [Activation](ms-settings:activation) pane: + When Windows Pro isn't activated on a device, the following message is displayed for **Activation** in the [**Activation**](ms-settings:activation) pane: `Windows is not activated` @@ -389,7 +389,7 @@ When there are problems with Windows Enterprise E3 or E5 subscription activation - **Windows Enterprise subscription isn't active** - When a device with a Windows Enterprise subscription has lapsed or has been removed, the following message is displayed for **Subscription** in the [Activation](ms-settings:activation) pane: + When a device with a Windows Enterprise subscription has lapsed or has been removed, the following message is displayed for **Subscription** in the [**Activation**](ms-settings:activation) pane: `Windows Enterprise subscription isn't valid.` diff --git a/windows/deployment/windows-subscription-activation.md b/windows/deployment/windows-subscription-activation.md index 9c15d279f1..1ee6716d03 100644 --- a/windows/deployment/windows-subscription-activation.md +++ b/windows/deployment/windows-subscription-activation.md @@ -11,7 +11,8 @@ ms.collection: - highpri - tier2 ms.topic: conceptual -ms.date: 02/13/2024 +zone_pivot_groups: windows-versions-11-10 +ms.date: 02/15/2024 appliesto: - ✅ Windows 11 - ✅ Windows 10 @@ -73,7 +74,7 @@ To support inherited activation, both the host computer and the VM must be runni > [!NOTE] > -> The following requirements don't apply to general Windows client activation on Azure. Azure activation requires a connection to Azure KMS only. It supports workgroup, hybrid, and Microsoft Entra joined VMs. In most scenarios, activation of Azure VMs happens automatically. For more information, see [Understanding Azure KMS endpoints for Windows product activation of Azure virtual machines](/troubleshoot/azure/virtual-machines/troubleshoot-activation-problems#understanding-azure-kms-endpoints-for-windows-product-activation-of-azure-virtual-machines). +> The following requirements don't apply to general Windows client activation on Azure. Azure activation requires a connection to Azure KMS only. Azure KMS supports workgroup, hybrid, and Microsoft Entra joined VMs. In most scenarios, activation of Azure VMs happens automatically. For more information, see [Understanding Azure KMS endpoints for Windows product activation of Azure virtual machines](/troubleshoot/azure/virtual-machines/troubleshoot-activation-problems#understanding-azure-kms-endpoints-for-windows-product-activation-of-azure-virtual-machines). > [!IMPORTANT] > @@ -90,8 +91,21 @@ For Microsoft customers that don't have EA or MPSA, Windows Enterprise E3/E5 or ### Windows Education requirements - A supported version of Windows Pro Education installed on the devices to be upgraded. -- A device with a Windows Pro Education digital license. This information can be confirmed under **Settings > System > Activation** or under **Settings > Update & Security > Activation**. + +::: zone pivot="windows-11" + +- A device with a Windows Pro Education digital license. This information can be confirmed in the [**Activation**](ms-settings:activation)pane of the **Settings** app under **Settings > System > Activation**. + +::: zone-end + +::: zone pivot="windows-10" + +- A device with a Windows Pro Education digital license. This information can be confirmed in the [**Activation**](ms-settings:activation)pane of the **Settings** app under **Settings > Update & Security > Activation**. + +::: zone-end + - The Education tenant must have an active subscription to Microsoft 365 with a Windows Enterprise license, or a Windows Enterprise or Education subscription. + - Devices must be Microsoft Entra joined or Microsoft Entra hybrid joined. Workgroup-joined or Microsoft Entra registered devices aren't supported. > [!IMPORTANT] @@ -121,7 +135,7 @@ Benefits of moving to Windows as an online service include: ## How it works -The device is Microsoft Entra joined, for example from **Settings** > **Accounts** > **Access work or school**. +The device is Microsoft Entra joined, for example from the [Access work or school](ms-settings:workplace) pane in the **Settings** app which can be found under **Settings** > **Accounts** > **Access work or school**. Windows Enterprise is assigned to a user, for example through the Microsoft 365 admin center. When a licensed user signs in to a device that meets requirements using their Microsoft Entra credentials, Windows steps up from Pro edition to Enterprise, or from Pro Education to Education. Once the edition is stepped up, Enterprise/Education features are unlocked. When a user's subscription expires or is transferred to another user, the device reverts seamlessly to Windows Pro or Windows Pro Education edition, once the current subscription validity expires.