@@ -8980,6 +9009,9 @@ dfsdiscoverdc">ADMX_DFS/DFSDiscoverDC
-
WirelessDisplay/AllowMdnsDiscovery
+ -
+ WirelessDisplay/AllowMovementDetectionOnInfrastructure
+
-
WirelessDisplay/AllowProjectionFromPC
diff --git a/windows/client-management/mdm/policy-csp-system.md b/windows/client-management/mdm/policy-csp-system.md
index ec9a25a296..9e31c3a67b 100644
--- a/windows/client-management/mdm/policy-csp-system.md
+++ b/windows/client-management/mdm/policy-csp-system.md
@@ -94,6 +94,12 @@ manager: dansimp
-
System/FeedbackHubAlwaysSaveDiagnosticsLocally
+ -
+ System/LimitDiagnosticLogCollection
+
+ -
+ System/LimitDumpCollection
+
-
System/LimitEnhancedDiagnosticDataWindowsAnalytics
@@ -1295,6 +1301,105 @@ The following list shows the supported values:
+
+**System/LimitDiagnosticLogCollection**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+This policy setting specifies whether diagnostic log data can be collected when more information is needed to troubleshoot a problem. It is sent only if we have permission to collect optional diagnostic data, and only if the device meets the criteria for additional data collection.
+
+If you disable or do not configure this policy setting, we may occasionally collect advanced diagnostic data if the user has opted to send optional diagnostic data.
+
+
+
+ADMX Info:
+- GP Friendly name: *Limit Diagnostic Log Collection*
+- GP name: *LimitDiagnosticLogCollection*
+- GP path: *Data Collection and Preview Builds*
+- GP ADMX file name: *DataCollection.admx*
+
+
+
+The following list shows the supported values:
+
+- 0 – Disabled
+- 1 – Enabled
+
+
+
+
+
+
+
+**System/LimitDumpCollection**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+This policy setting limits the type of dumps that can be collected when more information is needed to troubleshoot a problem. These dumps are not sent unless we have permission to collect optional diagnostic data.
+
+By enabling this policy setting, Windows Error Reporting is limited to sending kernel mini dumps and user mode triage dumps only.
+
+If you disable or do not configure this policy setting, we may occasionally collect full or heap dumps if the user has opted to send optional diagnostic data.
+
+
+
+ADMX Info:
+- GP Friendly name: *Limit Dump Collection*
+- GP name: *LimitDumpCollection*
+- GP path: *Data Collection and Preview Builds*
+- GP ADMX file name: *DataCollection.admx*
+
+
+
+The following list shows the supported values:
+
+- 0 – Disabled
+- 1 – Enabled
+
+
+
+
+
**System/LimitEnhancedDiagnosticDataWindowsAnalytics**
diff --git a/windows/client-management/mdm/policy-csp-textinput.md b/windows/client-management/mdm/policy-csp-textinput.md
index addf196173..be2edb8989 100644
--- a/windows/client-management/mdm/policy-csp-textinput.md
+++ b/windows/client-management/mdm/policy-csp-textinput.md
@@ -58,6 +58,9 @@ manager: dansimp
-
TextInput/AllowLinguisticDataCollection
+ -
+ TextInput/AllowTextInputSuggestionUpdate
+
-
TextInput/ConfigureJapaneseIMEVersion
@@ -616,6 +619,51 @@ This setting supports a range of values between 0 and 1.
+
+**TextInput/AllowTextInputSuggestionUpdate**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Allows the user to turn on or off the automatic downloading of newer versions of the Expressive Input UI.
+When downloading is not allowed the Expressive Input panel will always display the initial UI included with the base Windows image.
+
+Most restricted value is 0.
+
+Default: Enabled
+
+
+
+The following list shows the supported values:
+
+- 1 (Enabled) - The newer UX is downloaded from Microsoft service.
+- 0 (Disabled) - The UX remains unchanged with what the operating system installs.
+
+
+
+
+
+
**TextInput/ConfigureJapaneseIMEVersion**
diff --git a/windows/client-management/mdm/policy-csp-timelanguagesettings.md b/windows/client-management/mdm/policy-csp-timelanguagesettings.md
index c2421b3ac0..c1f1785f9d 100644
--- a/windows/client-management/mdm/policy-csp-timelanguagesettings.md
+++ b/windows/client-management/mdm/policy-csp-timelanguagesettings.md
@@ -22,12 +22,75 @@ manager: dansimp
## TimeLanguageSettings policies
+ -
+ TimeLanguageSettings/BlockCleanupOfUnusedPreinstalledLangPacks
+
-
TimeLanguageSettings/ConfigureTimeZone
+ -
+ TimeLanguageSettings/MachineUILanguageOverwrite
+
+ -
+ TimeLanguageSettings/RestrictLanguagePacksAndFeaturesInstall
+
+
+
+
+**TimeLanguageSettings/BlockCleanupOfUnusedPreinstalledLangPacks**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+This policy setting controls whether the maintenance task will run to clean up language packs installed on a machine but are not used by any users on that machine.
+
+If you enable this policy setting (value 1), language packs that are installed as part of the system image will remain installed even if they are not used by any user on that system.
+
+If you disable (value 0) or do not configure this policy setting, language packs that are installed as part of the system image but are not used by any user on that system will be removed as part of a scheduled clean up task.
+
+
+
+
+
+
+ADMX Info:
+- GP Friendly name: *Block cleanup of unused language packs*
+- GP name: *BlockCleanupOfUnusedPreinstalledLangPacks*
+- GP path: *Computer Configuration/Administrative Templates/Control Panel/Regional and Language Options*
+- GP ADMX file name: *Globalization.admx*
+
+
+
+
+
+
+
+
+
+
@@ -74,5 +137,103 @@ Specifies the time zone to be applied to the device. This is the standard Window
+
+**TimeLanguageSettings/MachineUILanguageOverwrite**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+This policy setting controls which UI language is used for computers with more than one UI language installed.
+
+If you enable this policy setting, the UI language of Windows menus and dialogs for systems with more than one language is restricted to a specified language. If the specified language is not installed on the target computer or you disable this policy setting, the language selection defaults to the language selected by the local administrator.
+
+If you disable or do not configure this policy setting, there is no restriction of a specific language used for the Windows menus and dialogs.
+
+
+
+
+
+
+ADMX Info:
+- GP Friendly name: *Force selected system UI language to overwrite the user UI language*
+- GP name: *MachineUILanguageOverwrite*
+- GP path: *Computer Configuration/Administrative Templates/Control Panel/Regional and Language Options*
+- GP ADMX file name: *Globalization.admx*
+
+
+
+
+
+
+
+
+
+
+
+
+
+**TimeLanguageSettings/RestrictLanguagePacksAndFeaturesInstall**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+This policy setting restricts standard users from installing language features on demand. This policy does not restrict the Windows language, if you want to restrict the Windows language use the following policy: “Restricts the UI languages Windows should use for the selected user.”
+
+If you enable this policy setting, the installation of language features is prevented for standard users.
+
+If you disable or do not configure this policy setting, there is no language feature installation restriction for the standard users.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/windows/client-management/mdm/policy-csp-update.md b/windows/client-management/mdm/policy-csp-update.md
index ec5de9aacf..a89fed4218 100644
--- a/windows/client-management/mdm/policy-csp-update.md
+++ b/windows/client-management/mdm/policy-csp-update.md
@@ -1222,7 +1222,6 @@ Enable IT admin to configure feature update uninstall period. Values range 2 - 6
-Since this policy is not blocked, you will not get a failure message when you use it to configure a Windows 10 Mobile device. However, the policy will not take effect.
Defers Feature Updates for the specified number of days.
@@ -1394,8 +1393,6 @@ ADMX Info:
> [!NOTE]
-> Since this policy is not blocked, you will not get a failure message when you use it to configure a Windows 10 Mobile device. However, the policy will not take effect.
->
> Don't use this policy in Windows 10, version 1607 devices, instead use the new policies listed in [Changes in Windows 10, version 1607 for update management](device-update-management.md#windows10version1607forupdatemanagement). You can continue to use DeferUpgradePeriod for Windows 10, version 1511 devices.
@@ -1929,8 +1926,6 @@ ADMX Info:
-> [!NOTE]
-> Since this policy is not blocked, you will not get a failure message when you use it to configure a Windows 10 Mobile device. However, the policy will not take effect.
Allows IT Admins to exclude Windows Update (WU) drivers during updates.
@@ -2049,7 +2044,7 @@ The following list shows the supported values:
To validate this policy:
1. Enable the policy and ensure the device is on a cellular network.
-2. Run the scheduled task on your device to check for app updates in the background. For example, on a mobile device, run the following commands in TShell:
+2. Run the scheduled task on your device to check for app updates in the background. For example, on a device, run the following commands in TShell:
```TShell
exec-device schtasks.exe -arguments '/run /tn "\Microsoft\Windows\WindowsUpdate\Automatic App Update" /I'
```
@@ -2102,7 +2097,7 @@ The following list shows the supported values:
To validate this policy:
1. Enable the policy and ensure the device is on a cellular network.
-2. Run the scheduled task on your device to check for app updates in the background. For example, on a mobile device, run the following commands in TShell:
+2. Run the scheduled task on your device to check for app updates in the background. For example, on a device, run the following commands in TShell:
```TShell
exec-device schtasks.exe -arguments '/run /tn "\Microsoft\Windows\WindowsUpdate\Automatic App Update" /I'
```
@@ -2244,8 +2239,6 @@ The following list shows the supported values:
-Since this policy is not blocked, you will not get a failure message when you use it to configure a Windows 10 Mobile device. However, the policy will not take effect.
-
Allows IT Admins to pause feature updates for up to 35 days. We recomment that you use the *Update/PauseFeatureUpdatesStartTime* policy if you are running Windows 10, version 1703 or later.
@@ -2422,38 +2415,14 @@ This policy is deprecated. Use [Update/RequireUpdateApproval](#update-requireupd
**Update/ProductVersion**
-
-
- | Edition |
- Windows 10 |
- Windows 11 |
-
-
- | Home |
- No |
- No |
-
-
- | Pro |
- Yes |
- Yes |
-
-
- | Business |
- Yes |
- Yes |
-
-
- | Enterprise |
- Yes |
- Yes |
-
-
- | Education |
- Yes |
- Yes |
-
-
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
@@ -2578,7 +2547,7 @@ The following list shows the supported values:
> [!NOTE]
-> This policy is *only* recommended for managing mobile devices. If you previously used the **Update/PhoneUpdateRestrictions** policy in previous versions of Windows, it has been deprecated. Please use this policy instead.
+> If you previously used the **Update/PhoneUpdateRestrictions** policy in previous versions of Windows, it has been deprecated. Please use this policy instead.
Allows the IT admin to restrict the updates that are installed on a device to only those on an update approval list. It enables IT to accept the End User License Agreement (EULA) associated with the approved update on behalf of the end-user. EULAs are approved once an update is approved.
diff --git a/windows/client-management/mdm/policy-csp-virtualizationbasedtechnology.md b/windows/client-management/mdm/policy-csp-virtualizationbasedtechnology.md
new file mode 100644
index 0000000000..2ca5d714a9
--- /dev/null
+++ b/windows/client-management/mdm/policy-csp-virtualizationbasedtechnology.md
@@ -0,0 +1,133 @@
+---
+title: Policy CSP - VirtualizationBasedTechnology
+description: Learn to use the Policy CSP - VirtualizationBasedTechnology setting to control the state of Hypervisor-protected Code Integrity (HVCI) on devices.
+ms.author: dansimp
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: alekyaj
+ms.localizationpriority: medium
+ms.date: 11/25/2021
+ms.reviewer:
+manager: dansimp
+---
+
+# Policy CSP - VirtualizationBasedTechnology
+
+
+
+
+## VirtualizationBasedTechnology policies
+
+
+ -
+ VirtualizationBasedTechnology/HypervisorEnforcedCodeIntegrity
+
+ -
+ VirtualizationBasedTechnology/RequireUEFIMemoryAttributesTable
+
+
+
+
+
+
+
+**VirtualizationBasedTechnology/HypervisorEnforcedCodeIntegrity**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|Yes|Yes|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Allows the IT admin to control the state of Hypervisor-protected Code Integrity (HVCI) on devices. HVCI is a feature within Virtualization Based Security, and is frequently referred to as Memory integrity. Learn more [here](/windows-hardware/design/device-experiences/oem-vbs).
+
+>[!NOTE]
+>After the policy is pushed, a system reboot will be required to change the state of HVCI.
+
+
+
+The following are the supported values:
+
+- 0: (Disabled) Turns off Hypervisor-Protected Code Integrity remotely if configured previously without UEFI Lock
+- 1: (Enabled with UEFI lock) Turns on Hypervisor-Protected Code Integrity with UEFI lock
+- 2: (Enabled without lock) Turns on Hypervisor-Protected Code Integrity without UEFI lock
+
+
+
+
+
+
+
+
+
+
+
+
+**VirtualizationBasedTechnology/RequireUEFIMemoryAttributesTable**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|Yes|Yes|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Allows the IT admin to control the state of Hypervisor-protected Code Integrity (HVCI) on devices. HVCI is a feature within Virtualization Based Security, and is frequently referred to as Memory integrity. Learn more [here](/windows-hardware/design/device-experiences/oem-vbs).
+
+>[!NOTE]
+>After the policy is pushed, a system reboot will be required to change the state of HVCI.
+
+
+
+
+The following are the supported values:
+
+- 0: (Disabled) Do not require UEFI Memory Attributes Table
+- 1: (Enabled) Require UEFI Memory Attributes Table
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/windows/client-management/mdm/policy-csp-wirelessdisplay.md b/windows/client-management/mdm/policy-csp-wirelessdisplay.md
index c9ae086d5d..d61b982f66 100644
--- a/windows/client-management/mdm/policy-csp-wirelessdisplay.md
+++ b/windows/client-management/mdm/policy-csp-wirelessdisplay.md
@@ -26,6 +26,9 @@ manager: dansimp
-
WirelessDisplay/AllowMdnsDiscovery
+ -
+ WirelessDisplay/AllowMovementDetectionOnInfrastructure
+
-
WirelessDisplay/AllowProjectionFromPC
@@ -129,6 +132,53 @@ The following list shows the supported values:
+
+**WirelessDisplay/AllowMovementDetectionOnInfrastructure**
+
+
+
+|Edition|Windows 10|Windows 11|
+|--- |--- |--- |
+|Home|No|No|
+|Pro|Yes|Yes|
+|Business|Yes|Yes|
+|Enterprise|Yes|Yes|
+|Education|Yes|Yes|
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+This policy setting allows you to disable the infrastructure movement detection feature.
+
+If you set it to 0, your PC may stay connected and continue to project if you walk away from a Wireless Display receiver to which you are projecting over infrastructure.
+
+If you set it to 1, your PC will detect that you have moved and will automatically disconnect your infrastructure Wireless Display session.
+
+The default value is 1.
+
+
+
+
+The following list shows the supported values:
+
+- 0 - Do not allow
+- 1 (Default) - Allow
+
+
+
+
+
+
**WirelessDisplay/AllowProjectionFromPC**
diff --git a/windows/client-management/mdm/toc.yml b/windows/client-management/mdm/toc.yml
index 7a1fa1b52f..6ac4cc4a3d 100644
--- a/windows/client-management/mdm/toc.yml
+++ b/windows/client-management/mdm/toc.yml
@@ -831,6 +831,8 @@ items:
href: policy-csp-update.md
- name: UserRights
href: policy-csp-userrights.md
+ - name: VirtualizationBasedTechnology
+ href: policy-csp-virtualizationbasedtechnology.md
- name: Wifi
href: policy-csp-wifi.md
- name: WindowsConnectionManager
diff --git a/windows/client-management/troubleshoot-event-id-41-restart.md b/windows/client-management/troubleshoot-event-id-41-restart.md
index 277685cfc8..c1d7a706b0 100644
--- a/windows/client-management/troubleshoot-event-id-41-restart.md
+++ b/windows/client-management/troubleshoot-event-id-41-restart.md
@@ -2,7 +2,7 @@
title: Advanced troubleshooting for Event ID 41 - "The system has rebooted without cleanly shutting down first"
description: Describes the circumstances that cause a computer to generate Event ID 41, and provides guidance for troubleshooting the issue
author: Teresa-Motiv
-ms.author: v-tea
+ms.author: dougeby
ms.date: 12/27/2019
ms.prod: w10
ms.topic: article
diff --git a/windows/client-management/troubleshoot-stop-error-on-broadcom-driver-update.md b/windows/client-management/troubleshoot-stop-error-on-broadcom-driver-update.md
index fb99d5d919..a22426c30a 100644
--- a/windows/client-management/troubleshoot-stop-error-on-broadcom-driver-update.md
+++ b/windows/client-management/troubleshoot-stop-error-on-broadcom-driver-update.md
@@ -2,7 +2,7 @@
title: Stop error occurs when you update the in-box Broadcom network adapter driver
description: Describes an issue that causes a stop error when you update an in-box Broadcom driver on Windows Server 2019, version 1809.
author: Teresa-Motiv
-ms.author: v-tea
+ms.author: dougeby
ms.date: 2/3/2020
ms.prod: w10
ms.topic: article
diff --git a/windows/configuration/provisioning-packages/provisioning-packages.md b/windows/configuration/provisioning-packages/provisioning-packages.md
index 8f3f00962f..703606edff 100644
--- a/windows/configuration/provisioning-packages/provisioning-packages.md
+++ b/windows/configuration/provisioning-packages/provisioning-packages.md
@@ -86,18 +86,6 @@ The following table describes settings that you can configure using the wizards
| Configure kiosk common settings | Set tablet mode, configure welcome and shutdown screens, turn off timeout settings | ❌ | ✔️ | ❌ |
| Developer Setup | Enable Developer Mode | ❌ | ❌ | ✔️ |
-
-
-
-
-
-
-
-
-
-
-
-
- [Instructions for the desktop wizard](provision-pcs-for-initial-deployment.md)
- [Instructions for the kiosk wizard](../kiosk-single-app.md#wizard)
- [Instructions for the HoloLens wizard](/hololens/hololens-provisioning#wizard)
@@ -138,7 +126,7 @@ WCD supports the following scenarios for IT administrators:
* **Simple provisioning** – Enables IT administrators to define a desired configuration in WCD and then apply that configuration on target devices. The simple provisioning wizard makes the entire process quick and easy by guiding an IT administrator through common configuration settings in a step-by-step manner.
-[Learn how to use simple provisioning to configure Windows computers.](provision-pcs-for-initial-deployment.md)
+ [Learn how to use simple provisioning to configure Windows computers.](provision-pcs-for-initial-deployment.md)
* **Advanced provisioning (deployment of classic (Win32) and Universal Windows Platform (UWP) apps, and certificates)** – Allows an IT administrator to use WCD to open provisioning packages in the advanced settings editor and include apps for deployment on end-user devices.
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 0cb346ab02..18cc716b31 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -64,8 +64,8 @@ Shared PC mode exposes a set of customizations to tailor the behavior to your re
| Setting | Value |
|:---|:---|
| EnableSharedPCMode | Set as **True**. If this is not set to **True**, shared PC mode is not turned on and none of the other settings apply. This setting controls this API: [IsEnabled](/uwp/api/windows.system.profile.sharedmodesettings) Some of the remaining settings in **SharedPC** are optional, but we strongly recommend that you also set `EnableAccountManager` to **True**. |
-| AccountManagement: AccountModel | This option controls how users can sign-in on the PC. Choosing domain-joined will enable any user in the domain to sign-in. Specifying the guest option will add the **Guest** option to the sign-in screen and enable anonymous guest access to the PC.
- **Only guest** allows anyone to use the PC as a local standard (non-admin) account.
- **Domain-joined only** allows users to sign in with an Active Directory or Azure AD account.
- **Domain-joined and guest** allows users to sign in with an Active Directory, Azure AD, or local standard account. |
-| AccountManagement: DeletionPolicy | - **Delete immediately** will delete the account on sign-out.
- **Delete at disk space threshold** will start deleting accounts when available disk space falls below the threshold you set for **DiskLevelDeletion**, and it will stop deleting accounts when the available disk space reaches the threshold you set for **DiskLevelCaching**. Accounts are deleted in order of oldest accessed to most recently accessed.
Example: The caching number is 50 and the deletion number is 25. Accounts will be cached while the free disk space is above 25%. When the free disk space is less than 25% (the deletion number) at a maintenance period, accounts will be deleted (oldest last used first) until the free disk space is above 50% (the caching number). Accounts will be deleted immediately at sign off of an account if free space is under the deletion threshold and disk space is very low, regardless if the PC is actively in use or not.
- **Delete at disk space threshold and inactive threshold** will apply the same disk space checks as noted above, but also delete accounts if they have not signed in within the number of days specified by **InactiveThreshold** |
+| AccountManagement: AccountModel | This option controls how users can sign-in on the PC. Choosing domain-joined will enable any user in the domain to sign-in.
Specifying the guest option will add the **Guest** option to the sign-in screen and enable anonymous guest access to the PC.
- **Only guest** allows anyone to use the PC as a local standard (non-admin) account.
- **Domain-joined only** allows users to sign in with an Active Directory or Azure AD account.
- **Domain-joined and guest** allows users to sign in with an Active Directory, Azure AD, or local standard account. |
+| AccountManagement: DeletionPolicy | - **Delete immediately** will delete the account on sign-out.
- **Delete at disk space threshold** will start deleting accounts when available disk space falls below the threshold you set for **DiskLevelDeletion**, and it will stop deleting accounts when the available disk space reaches the threshold you set for **DiskLevelCaching**. Accounts are deleted in order of oldest accessed to most recently accessed.
Example: The caching number is 50 and the deletion number is 25. Accounts will be cached while the free disk space is above 25%. When the free disk space is less than 25% (the deletion number) at a maintenance period, accounts will be deleted (oldest last used first) until the free disk space is above 50% (the caching number). Accounts will be deleted immediately at sign off of an account if free space is under the deletion threshold and disk space is very low, regardless if the PC is actively in use or not.
- **Delete at disk space threshold and inactive threshold** will apply the same disk space checks as noted above, but also delete accounts if they have not signed in within the number of days specified by **InactiveThreshold** |
| AccountManagement: DiskLevelCaching | If you set **DeletionPolicy** to **Delete at disk space threshold**, set the percent of total disk space to be used as the disk space threshold for account caching. |
| AccountManagement: DiskLevelDeletion | If you set **DeletionPolicy** to **Delete at disk space threshold**, set the percent of total disk space to be used as the disk space threshold for account deletion. |
| AccountManagement: InactiveThreshold | If you set **DeletionPolicy** to **Delete at disk space threshold and inactive threshold**, set the number of days after which an account that has not signed in will be deleted. |
@@ -243,92 +243,137 @@ On a desktop computer, navigate to **Settings** > **Accounts** > **Work ac
New-Item -Path "HKLM:\Software\Microsoft\Windows\CurrentVersion\SharedPC\Exemptions\$sid" -Force
```
-
## Policies set by shared PC mode
+
Shared PC mode sets local group policies to configure the device. Some of these are configurable using the shared pc mode options.
> [!IMPORTANT]
> It is not recommended to set additional policies on PCs configured for **Shared PC Mode**. The shared PC mode has been optimized to be fast and reliable over time with minimal to no manual maintenance required.
-
+### Admin Templates > Control Panel > Personalization
-Policy name | Value | When set? |
|---|
-
-Admin Templates > Control Panel > Personalization |
-Prevent enabling lock screen slide show | Enabled | Always |
-Prevent changing lock screen and logon image | Enabled | Always |
-Admin Templates > System > Power Management > Button Settings |
-Select the Power button action (plugged in) | Sleep | SetPowerPolicies=True |
-Select the Power button action (on battery) | Sleep | SetPowerPolicies=True |
-Select the Sleep button action (plugged in) | Sleep | SetPowerPolicies=True |
-Select the lid switch action (plugged in) | Sleep | SetPowerPolicies=True |
-Select the lid switch action (on battery) | Sleep | SetPowerPolicies=True |
-Admin Templates > System > Power Management > Sleep Settings |
-Require a password when a computer wakes (plugged in) | Enabled | SignInOnResume=True |
-Require a password when a computer wakes (on battery) | Enabled | SignInOnResume=True |
-Specify the system sleep timeout (plugged in) | SleepTimeout | SetPowerPolicies=True |
-Specify the system sleep timeout (on battery) | SleepTimeout | SetPowerPolicies=True |
- | Turn off hybrid sleep (plugged in) | Enabled | SetPowerPolicies=True |
- | Turn off hybrid sleep (on battery) | Enabled | SetPowerPolicies=True |
- | Specify the unattended sleep timeout (plugged in) | SleepTimeout | SetPowerPolicies=True |
- | Specify the unattended sleep timeout (on battery) | SleepTimeout | SetPowerPolicies=True |
- | Allow standby states (S1-S3) when sleeping (plugged in) | Enabled | SetPowerPolicies=True |
- | Allow standby states (S1-S3) when sleeping (on battery) | Enabled | SetPowerPolicies=True |
- | Specify the system hibernate timeout (plugged in) | Enabled, 0 | SetPowerPolicies=True |
- | Specify the system hibernate timeout (on battery) | Enabled, 0 | SetPowerPolicies=True |
- | Admin Templates>System>Power Management>Video and Display Settings |
- | Turn off the display (plugged in) | SleepTimeout | SetPowerPolicies=True |
- | Turn off the display (on battery | SleepTimeout | SetPowerPolicies=True |
- | Admin Templates>System>Power Management>Energy Saver Settings |
- | Energy Saver Battery Threshold (on battery) | 70 | SetPowerPolicies=True |
- | Admin Templates>System>Logon |
- | Show first sign-in animation | Disabled | Always |
- | Hide entry points for Fast User Switching | Enabled | Always |
- | Turn on convenience PIN sign-in | Disabled | Always |
- | Turn off picture password sign-in | Enabled | Always |
- | Turn off app notification on the lock screen | Enabled | Always |
- | Allow users to select when a password is required when resuming from connected standby | Disabled | SignInOnResume=True |
-
- | Block user from showing account details on sign-in | Enabled | Always |
- | Admin Templates>System>User Profiles |
- | Turn off the advertising ID | Enabled | SetEduPolicies=True |
- | Admin Templates>Windows Components |
- | Do not show Windows Tips | Enabled | SetEduPolicies=True |
- | Turn off Microsoft consumer experiences | Enabled | SetEduPolicies=True |
- | Microsoft Passport for Work | Disabled | Always |
- | Prevent the usage of OneDrive for file storage | Enabled | Always |
- | Admin Templates>Windows Components>Biometrics |
- | Allow the use of biometrics | Disabled | Always |
- | Allow users to log on using biometrics | Disabled | Always |
- | Allow domain users to log on using biometrics | Disabled | Always |
- | Admin Templates>Windows Components>Data Collection and Preview Builds |
- | Toggle user control over Insider builds | Disabled | Always |
- | Disable pre-release features or settings | Disabled | Always |
- | Do not show feedback notifications | Enabled | Always |
-| Allow Telemetry | Basic, 0 | SetEduPolicies=True |
- | Admin Templates>Windows Components>File Explorer |
- | Show lock in the user tile menu | Disabled | Always |
- | Admin Templates>Windows Components>Maintenance Scheduler |
- | Automatic Maintenance Activation Boundary | MaintenanceStartTime | Always |
- | Automatic Maintenance Random Delay | Enabled, 2 hours | Always |
- | Automatic Maintenance WakeUp Policy | Enabled | Always |
- | Admin Templates>Windows Components>Windows Hello for Business |
- | Use phone sign-in | Disabled | Always |
- | Use Windows Hello for Business | Disabled | Always |
- | Use biometrics | Disabled | Always |
- | Admin Templates>Windows Components>OneDrive |
- | Prevent the usage of OneDrive for file storage | Enabled | Always |
- | Windows Settings>Security Settings>Local Policies>Security Options |
-
- | Interactive logon: Do not display last user name | Enabled, Disabled when account model is only guest | Always |
- | Interactive logon: Sign-in last interactive user automatically after a system-initiated restart | Disabled | Always |
-
- | Shutdown: Allow system to be shut down without having to log on | Disabled | Always |
- | User Account Control: Behavior of the elevation prompt for standard users | Auto deny | Always |
-
-
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Prevent enabling lock screen slide show|Enabled|Always|
+|Prevent changing lock screen and logon image|Enabled|Always|
+### Admin Templates > System > Power Management > Button Settings
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Select the Power button action (plugged in)|Sleep|SetPowerPolicies=True|
+|Select the Power button action (on battery)|Sleep|SetPowerPolicies=True|
+|Select the Sleep button action (plugged in)|Sleep|SetPowerPolicies=True|
+|Select the lid switch action (plugged in)|Sleep|SetPowerPolicies=True|
+|Select the lid switch action (on battery)|Sleep|SetPowerPolicies=True|
+### Admin Templates > System > Power Management > Sleep Settings
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Require a password when a computer wakes (plugged in)|Enabled|SignInOnResume=True|
+|Require a password when a computer wakes (on battery)|Enabled|SignInOnResume=True|
+|Specify the system sleep timeout (plugged in)|*SleepTimeout*|SetPowerPolicies=True|
+|Specify the system sleep timeout (on battery)|*SleepTimeout*|SetPowerPolicies=True|
+|Turn off hybrid sleep (plugged in)|Enabled|SetPowerPolicies=True|
+|Turn off hybrid sleep (on battery)|Enabled|SetPowerPolicies=True|
+|Specify the unattended sleep timeout (plugged in)|*SleepTimeout*|SetPowerPolicies=True|
+|Specify the unattended sleep timeout (on battery)|*SleepTimeout*|SetPowerPolicies=True|
+|Allow standby states (S1-S3) when sleeping (plugged in)|Enabled|SetPowerPolicies=True|
+|Allow standby states (S1-S3) when sleeping (on battery)|Enabled |SetPowerPolicies=True|
+|Specify the system hibernate timeout (plugged in)|Enabled, 0|SetPowerPolicies=True|
+|Specify the system hibernate timeout (on battery)|Enabled, 0|SetPowerPolicies=True|
+### Admin Templates>System>Power Management>Video and Display Settings
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Turn off the display (plugged in)|*SleepTimeout*|SetPowerPolicies=True|
+|Turn off the display (on battery|*SleepTimeout*|SetPowerPolicies=True|
+
+### Admin Templates>System>Power Management>Energy Saver Settings
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Energy Saver Battery Threshold (on battery)|70|SetPowerPolicies=True|
+
+### Admin Templates>System>Logon
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Show first sign-in animation|Disabled|Always|
+|Hide entry points for Fast User Switching|Enabled|Always|
+|Turn on convenience PIN sign-in|Disabled|Always|
+|Turn off picture password sign-in|Enabled|Always|
+|Turn off app notification on the lock screen|Enabled|Always|
+|Allow users to select when a password is required when resuming from connected standby|Disabled|SignInOnResume=True|
+|Block user from showing account details on sign-in|Enabled|Always|
+
+### Admin Templates>System>User Profiles
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Turn off the advertising ID|Enabled|SetEduPolicies=True|
+
+### Admin Templates>Windows Components
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Do not show Windows Tips |Enabled|SetEduPolicies=True|
+|Turn off Microsoft consumer experiences |Enabled|SetEduPolicies=True|
+|Microsoft Passport for Work|Disabled|Always|
+|Prevent the usage of OneDrive for file storage|Enabled|Always|
+
+### Admin Templates>Windows Components>Biometrics
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Allow the use of biometrics|Disabled|Always|
+|Allow users to log on using biometrics|Disabled|Always|
+|Allow domain users to log on using biometrics|Disabled|Always|
+
+### Admin Templates>Windows Components>Data Collection and Preview Builds
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Toggle user control over Insider builds|Disabled|Always|
+|Disable pre-release features or settings|Disabled|Always|
+|Do not show feedback notifications|Enabled|Always|
+|Allow Telemetry|Basic, 0|SetEduPolicies=True|
+
+### Admin Templates>Windows Components>File Explorer
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Show lock in the user tile menu|Disabled|Always|
+
+### Admin Templates>Windows Components>Maintenance Scheduler
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Automatic Maintenance Activation Boundary|*MaintenanceStartTime*|Always|
+|Automatic Maintenance Random Delay|Enabled, 2 hours|Always|
+|Automatic Maintenance WakeUp Policy|Enabled|Always|
+
+### Admin Templates>Windows Components>Windows Hello for Business
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Use phone sign-in|Disabled|Always|
+|Use Windows Hello for Business|Disabled|Always|
+|Use biometrics|Disabled|Always|
+
+### Admin Templates>Windows Components>OneDrive
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Prevent the usage of OneDrive for file storage|Enabled|Always|
+
+### Windows Settings>Security Settings>Local Policies>Security Options
+
+|Policy Name| Value|When set?|
+|--- |--- |--- |
+|Interactive logon: Do not display last user name|Enabled, Disabled when account model is only guest|Always|
+|Interactive logon: Sign-in last interactive user automatically after a system-initiated restart|Disabled |Always|
+|Shutdown: Allow system to be shut down without having to log on|Disabled|Always|
+|User Account Control: Behavior of the elevation prompt for standard users|Auto deny|Always|
diff --git a/windows/deployment/planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md b/windows/deployment/planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
index 6135a8daf8..b225fd6214 100644
--- a/windows/deployment/planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
+++ b/windows/deployment/planning/searching-for-installed-compatibility-fixes-with-the-query-tool-in-compatibility-administrator.md
@@ -105,8 +105,7 @@ You can use the **Fix Description** tab of the Query tool to add parameters that
The query runs and the results of the query are displayed in the lower pane.
-## Querying by Using the Fix Description Tab
-
+## Querying by Using the Advanced Tab
You can use the **Fix Description** tab of the Query tool to add additional SQL Server SELECT and WHERE clauses to your search criteria.
diff --git a/windows/deployment/update/windows-as-a-service.md b/windows/deployment/update/windows-as-a-service.md
index 2e41bda86e..a034dba7a3 100644
--- a/windows/deployment/update/windows-as-a-service.md
+++ b/windows/deployment/update/windows-as-a-service.md
@@ -1,5 +1,5 @@
---
-title: Windows as a service
+title: Windows as a service
ms.prod: w10
ms.topic: landing-page
ms.manager: laurawi
@@ -26,21 +26,20 @@ Find the latest and greatest news on Windows 10 deployment and servicing.
**Discovering the Windows 10 Update history pages**
> [!VIDEO https://www.youtube-nocookie.com/embed/mTnAb9XjMPY]
-Everyone wins when transparency is a top priority. We want you to know when updates are available, as well as alert you to any potential issues you may encounter during or after you install an update. Bookmark the Windows release health dashboard for near real-time information on known issues, workarounds, and resolutions--as well as the current status of the latest feature update rollout.
+Everyone wins when transparency is a top priority. We want you to know when updates are available, as well as alert you to any potential issues you may encounter during or after you install an update. Bookmark the [Windows release health dashboard](/windows/release-health/) for near real-time information on known issues, workarounds, and resolutions--as well as the current status of the latest feature update rollout.
The latest news:
-
-- How to get Extended Security Updates for eligible Windows devices - October 17, 2019
-- End of service reminders for Windows 10, versions 1703 and 1803 - October 9, 2019
-- Using machine learning to improve the Windows 10 update experience - September 26, 2019
-- Publishing pre-release Windows 10 feature updates to WSUS - September 24, 2019
-- New extended support dates for MDOP tools - September 4, 2019
-- FastTrack for Windows 10 deployment and other migration resources - August 12, 2019
-- Tactical considerations for creating Windows deployment rings - July 10, 2019
-- Upgrading Windows 10 devices with installation media different than the original OS install language - July 9, 2019
-- Moving to the next Windows 10 feature update for commercial customers - July 1, 2019
-
+
+- [How to get Extended Security Updates for eligible Windows devices](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/How-to-get-Extended-Security-Updates-for-eligible-Windows/ba-p/917807) - October 17, 2019
+- [End of service reminders for Windows 10, versions 1703 and 1803](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/End-of-service-reminders-for-Windows-10-versions-1703-and-1803/ba-p/903715) - October 9, 2019
+- [Using machine learning to improve the Windows 10 update experience](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Using-machine-learning-to-improve-the-Windows-10-update/ba-p/877860) - September 26, 2019
+- [Publishing pre-release Windows 10 feature updates to WSUS](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Publishing-pre-release-Windows-10-feature-updates-to-WSUS/ba-p/845054) - September 24, 2019
+- [New extended support dates for MDOP tools](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/New-extended-support-dates-for-MDOP-tools/ba-p/837312) - September 4, 2019
+- [FastTrack for Windows 10 deployment and other migration resources](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/FastTrack-for-Windows-10-deployment-and-other-migration/ba-p/800406) - August 12, 2019
+- [Tactical considerations for creating Windows deployment rings](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Tactical-considerations-for-creating-Windows-deployment-rings/ba-p/746979) - July 10, 2019
+- [Upgrading Windows 10 devices with installation media different than the original OS install language](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Upgrading-Windows-10-devices-with-installation-media-different/ba-p/746126) - July 9, 2019
+- [Moving to the next Windows 10 feature update for commercial customers](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Moving-to-the-next-Windows-10-feature-update-for-commercial/ba-p/732968) - July 1, 2019
+
[See more news](waas-morenews.md). You can also check out the [Windows 10 blog](https://techcommunity.microsoft.com/t5/Windows-10-Blog/bg-p/Windows10Blog).
@@ -49,20 +48,19 @@ Written by IT pros for IT pros, sharing real world examples and scenarios for Wi
-**NEW** Tactical considerations for creating Windows deployment rings
+[**NEW** Tactical considerations for creating Windows deployment rings](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Tactical-considerations-for-creating-Windows-deployment-rings/ba-p/746979)
-**NEW** Windows 10 Enterprise vs. Windows 10 Pro: Modern management considerations for your organization
+[**NEW** Windows 10 Enterprise vs. Windows 10 Pro: Modern management considerations for your organization](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Windows-10-Enterprise-vs-Windows-10-Pro-Modern-management/ba-p/720445)
-Deployment rings: The hidden [strategic] gem of Windows as a service
+[Deployment rings: The hidden [strategic] gem of Windows as a service](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Deployment-rings-The-hidden-strategic-gem-of-Windows-as-a/ba-p/659622)
-Classifying Windows updates in common deployment tools
+[Classifying Windows updates in common deployment tools](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/Classifying-Windows-updates-in-common-deployment-tools/ba-p/331175)
-Express updates for Windows Server 2016 re-enabled for November 2018 update
-
+[Express updates for Windows Server 2016 re-enabled for November 2018 update](/windows-server/get-started/express-updates)
-2019 SHA-2 Code Signing Support requirement for Windows and WSUS
+[2019 SHA-2 Code Signing Support requirement for Windows and WSUS](https://support.microsoft.com/help/4472027/)
-Deploying Windows 10 Feature Updates to 24/7 Mission Critical Devices
+[What is Windows Update for Business?](waas-manage-updates-wufb.md)
## Discover
@@ -70,14 +68,14 @@ Learn more about Windows as a service and its value to your organization.
-Overview of Windows as a service
+[Overview of Windows as a service](waas-overview.md)
-Quick guide to Windows as a service
+[Quick guide to Windows as a service](waas-quick-start.md)
-What's new in Windows 10 deployment
+[What's new in Windows 10 deployment](../deploy-whats-new.md)
-How Microsoft IT deploys Windows 10
+[How Microsoft IT deploys Windows 10](https://channel9.msdn.com/events/Ignite/2015/BRK3303)
## Plan
@@ -85,15 +83,15 @@ Prepare to implement Windows as a service effectively using the right tools, pro
-Simplified updates
+[Simplified updates](https://www.microsoft.com/windowsforbusiness/simplified-updates)
-Windows 10 end user readiness
+[Windows 10 end user readiness](https://www.microsoft.com/itpro/windows-10/end-user-readiness)
-Ready for Windows
+[Ready for Windows](https://developer.microsoft.com/windows/ready-for-windows#/)
-Manage Windows upgrades with Upgrade Readiness
+[Manage Windows upgrades with Upgrade Readiness](/mem/configmgr/desktop-analytics/overview)
-Preparing your organization for a seamless Windows 10 deployment
+[Preparing your organization for a seamless Windows 10 deployment](https://www.microsoft.com/itshowcase/windows10deployment)
## Deploy
@@ -101,18 +99,18 @@ Secure your organization's deployment investment.
-Update Windows 10 in the enterprise
+[Update Windows 10 in the enterprise](index.md)
-Deploying as an in-place upgrade
+[Deploying as an in-place upgrade](https://www.microsoft.com/itshowcase/Article/Content/668/Deploying-Windows-10-at-Microsoft-as-an-inplace-upgrade)
-Configure Windows Update for Business
+[Configure Windows Update for Business](waas-configure-wufb.md)
-Express update delivery
+[Express update delivery](waas-optimize-windows-10-updates.md#express-update-delivery)
-Windows 10 deployment considerations
+[Windows 10 deployment considerations](../planning/windows-10-deployment-considerations.md)
## Microsoft Ignite 2018
-Looking to learn more? These informative session replays from Microsoft Ignite 2018 (complete with downloadable slide decks) can provide some great insights on Windows as a service. See [MyIgnite - Session catalog](https://myignite.techcommunity.microsoft.com/sessions).
\ No newline at end of file
+Looking to learn more? These informative session replays from Microsoft Ignite 2018 (complete with downloadable slide decks) can provide some great insights on Windows as a service. See [MyIgnite - Session catalog](https://myignite.techcommunity.microsoft.com/sessions).
diff --git a/windows/deployment/upgrade/upgrade-error-codes.md b/windows/deployment/upgrade/upgrade-error-codes.md
index 2286a7ec90..2b08e9adc9 100644
--- a/windows/deployment/upgrade/upgrade-error-codes.md
+++ b/windows/deployment/upgrade/upgrade-error-codes.md
@@ -21,10 +21,9 @@ ms.collection: highpri
- Windows 10
>[!NOTE]
->This is a 400 level topic (advanced).
+>This is a 400 level topic (advanced).
>See [Resolve Windows 10 upgrade errors](resolve-windows-10-upgrade-errors.md) for a full list of topics in this article.
-
If the upgrade process is not successful, Windows Setup will return two codes:
1. **A result code**: The result code corresponds to a specific Win32 or NTSTATUS error.
@@ -39,7 +38,7 @@ Note: If only a result code is returned, this can be because a tool is being use
## Result codes
-A result code of **0xC1900101** is generic and indicates that a rollback occurred. In most cases, the cause is a driver compatibility issue.
To troubleshoot a failed upgrade that has returned a result code of 0xC1900101, analyze the extend code to determine the Windows Setup phase, and see the [Resolution procedures](resolution-procedures.md) section later in this article.
+A result code of **0xC1900101** is generic and indicates that a rollback occurred. In most cases, the cause is a driver compatibility issue. To troubleshoot a failed upgrade that has returned a result code of 0xC1900101, analyze the extend code to determine the Windows Setup phase, and see the [Resolution procedures](resolution-procedures.md) section later in this article.
The following set of result codes are associated with [Windows Setup](/windows-hardware/manufacture/desktop/windows-setup-command-line-options) compatibility warnings:
@@ -88,74 +87,64 @@ Extend codes can be matched to the phase and operation when an error occurred. T
The following tables provide the corresponding phase and operation for values of an extend code:
-
+### Extend code: phase
-
-| Extend code: phase |
-
| Hex | Phase
- |
| 0 | SP_EXECUTION_UNKNOWN
- |
| 1 | SP_EXECUTION_DOWNLEVEL
- |
| 2 | SP_EXECUTION_SAFE_OS
- |
| 3 | SP_EXECUTION_FIRST_BOOT
- |
| 4 | SP_EXECUTION_OOBE_BOOT
- |
| 5 | SP_EXECUTION_UNINSTALL
- |
+|Hex|Phase|
+|--- |--- |
+|0|SP_EXECUTION_UNKNOWN|
+|1|SP_EXECUTION_DOWNLEVEL|
+|2|SP_EXECUTION_SAFE_OS|
+|3|SP_EXECUTION_FIRST_BOOT|
+|4|SP_EXECUTION_OOBE_BOOT|
+|5|SP_EXECUTION_UNINSTALL|
+### Extend code: Operation
-
-| Extend code: operation |
-
-
-| Hex | Operation
-| 0 | SP_EXECUTION_OP_UNKNOWN
-| 1 | SP_EXECUTION_OP_COPY_PAYLOAD
-| 2 | SP_EXECUTION_OP_DOWNLOAD_UPDATES
-| 3 | SP_EXECUTION_OP_INSTALL_UPDATES
-| 4 | SP_EXECUTION_OP_INSTALL_RECOVERY_ENVIRONMENT
-| 5 | SP_EXECUTION_OP_INSTALL_RECOVERY_IMAGE
-| 6 | SP_EXECUTION_OP_REPLICATE_OC
-| 7 | SP_EXECUTION_OP_INSTALL_DRVIERS
-| 8 | SP_EXECUTION_OP_PREPARE_SAFE_OS
-| 9 | SP_EXECUTION_OP_PREPARE_ROLLBACK
-| A | SP_EXECUTION_OP_PREPARE_FIRST_BOOT
-| B | SP_EXECUTION_OP_PREPARE_OOBE_BOOT
-| C | SP_EXECUTION_OP_APPLY_IMAGE
-| D | SP_EXECUTION_OP_MIGRATE_DATA
-| E | SP_EXECUTION_OP_SET_PRODUCT_KEY
-| F | SP_EXECUTION_OP_ADD_UNATTEND
- | | | | | | | | | | | | | | | | |
- |
-
-
-| Hex | Operation
- | | 10 | SP_EXECUTION_OP_ADD_DRIVER
-| 11 | SP_EXECUTION_OP_ENABLE_FEATURE
-| 12 | SP_EXECUTION_OP_DISABLE_FEATURE
-| 13 | SP_EXECUTION_OP_REGISTER_ASYNC_PROCESS
-| 14 | SP_EXECUTION_OP_REGISTER_SYNC_PROCESS
-| 15 | SP_EXECUTION_OP_CREATE_FILE
-| 16 | SP_EXECUTION_OP_CREATE_REGISTRY
-| 17 | SP_EXECUTION_OP_BOOT
-| 18 | SP_EXECUTION_OP_SYSPREP
-| 19 | SP_EXECUTION_OP_OOBE
-| 1A | SP_EXECUTION_OP_BEGIN_FIRST_BOOT
-| 1B | SP_EXECUTION_OP_END_FIRST_BOOT
-| 1C | SP_EXECUTION_OP_BEGIN_OOBE_BOOT
-| 1D | SP_EXECUTION_OP_END_OOBE_BOOT
-| 1E | SP_EXECUTION_OP_PRE_OOBE
-| 1F | SP_EXECUTION_OP_POST_OOBE
-| 20 | SP_EXECUTION_OP_ADD_PROVISIONING_PACKAGE
- | | | | | | | | | | | | | | | | |
- |
-
-
+|Hex|Operation|
+|--- |--- |
+|0|SP_EXECUTION_OP_UNKNOWN|
+|1|SP_EXECUTION_OP_COPY_PAYLOAD|
+|2|SP_EXECUTION_OP_DOWNLOAD_UPDATES|
+|3|SP_EXECUTION_OP_INSTALL_UPDATES|
+|4|SP_EXECUTION_OP_INSTALL_RECOVERY_ENVIRONMENT|
+|5|SP_EXECUTION_OP_INSTALL_RECOVERY_IMAGE|
+|6|SP_EXECUTION_OP_REPLICATE_OC|
+|7|SP_EXECUTION_OP_INSTALL_DRIVERS|
+|8|SP_EXECUTION_OP_PREPARE_SAFE_OS|
+|9|SP_EXECUTION_OP_PREPARE_ROLLBACK|
+|A|SP_EXECUTION_OP_PREPARE_FIRST_BOOT|
+|B|SP_EXECUTION_OP_PREPARE_OOBE_BOOT|
+|C|SP_EXECUTION_OP_APPLY_IMAGE|
+|D|SP_EXECUTION_OP_MIGRATE_DATA|
+|E|SP_EXECUTION_OP_SET_PRODUCT_KEY|
+|F|SP_EXECUTION_OP_ADD_UNATTEND|
+
+|Hex|Operation|
+|--- |--- |
+|10|SP_EXECUTION_OP_ADD_DRIVER|
+|11|SP_EXECUTION_OP_ENABLE_FEATURE|
+|12|SP_EXECUTION_OP_DISABLE_FEATURE|
+|13|SP_EXECUTION_OP_REGISTER_ASYNC_PROCESS|
+|14|SP_EXECUTION_OP_REGISTER_SYNC_PROCESS|
+|15|SP_EXECUTION_OP_CREATE_FILE|
+|16|SP_EXECUTION_OP_CREATE_REGISTRY|
+|17|SP_EXECUTION_OP_BOOT|
+|18|SP_EXECUTION_OP_SYSPREP|
+|19|SP_EXECUTION_OP_OOBE|
+|1A|SP_EXECUTION_OP_BEGIN_FIRST_BOOT|
+|1B|SP_EXECUTION_OP_END_FIRST_BOOT|
+|1C|SP_EXECUTION_OP_BEGIN_OOBE_BOOT|
+|1D|SP_EXECUTION_OP_END_OOBE_BOOT|
+|1E|SP_EXECUTION_OP_PRE_OOBE|
+|1F|SP_EXECUTION_OP_POST_OOBE|
+|20|SP_EXECUTION_OP_ADD_PROVISIONING_PACKAGE|
For example: An extend code of **0x4000D**, represents a problem during phase 4 (**0x4**) with data migration (**000D**).
## Related topics
-[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
-
[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
-
[Windows 10 Specifications](https://www.microsoft.com/windows/Windows-/ifications)
-
[Windows 10 IT pro forums](https://social.technet.microsoft.com/Forums/en-US/home?category=Windows10ITPro)
-
[Fix Windows Update errors by using the DISM or System Update Readiness tool](https://support.microsoft.com/kb/947821)
\ No newline at end of file
+[Windows 10 FAQ for IT professionals](../planning/windows-10-enterprise-faq-itpro.yml)
+[Windows 10 Enterprise system requirements](https://technet.microsoft.com/windows/dn798752.aspx)
+[Windows 10 Specifications](https://www.microsoft.com/windows/windows-10-specifications)
+[Microsoft Windows Q & A](/answers/products/windows)
+[Fix Windows Update errors by using the DISM or System Update Readiness tool](https://support.microsoft.com/kb/947821)
diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md
index e7434cf95e..4505749b15 100644
--- a/windows/deployment/upgrade/windows-10-edition-upgrades.md
+++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md
@@ -135,6 +135,7 @@ Downgrading from any edition of Windows 10 to Windows 7, 8, or 8.1 by entering a
### Scenario example
Downgrading from Enterprise
+
- Original edition: **Professional OEM**
- Upgrade edition: **Enterprise**
- Valid downgrade paths: **Pro, Pro for Workstations, Pro Education, Education**
@@ -143,102 +144,24 @@ You can move directly from Enterprise to any valid destination edition. In this
### Supported Windows 10 downgrade paths
-✔ = Supported downgrade path
- S = Supported; Not considered a downgrade or an upgrade
-[blank] = Not supported or not a downgrade
+✔ = Supported downgrade path
-
-
-
- | Destination edition |
-
-
- | |
- |
- Home |
- Pro |
- Pro for Workstations |
- Pro Education |
- Education |
- Enterprise LTSC |
- Enterprise |
-
-
- | Starting edition |
-
-
- | Home |
- |
- |
- |
- |
- |
- |
- |
-
-
- | Pro |
- |
- |
- |
- |
- |
- |
- |
-
-
- | Pro for Workstations |
- |
- |
- |
- |
- |
- |
- |
-
-
- | Pro Education |
- |
- |
- |
- |
- |
- |
- |
-
-
- | Education |
- |
- ✔ |
- ✔ |
- ✔ |
- |
- |
- S |
-
-
- | Enterprise LTSC |
- |
- |
- |
- |
- |
- |
- |
-
-
- | Enterprise |
- |
- ✔ |
- ✔ |
- ✔ |
- S |
- |
- |
-
-
+S = Supported; Not considered a downgrade or an upgrade
+
+[blank] = Not supported or not a downgrade
+
+**Destination Edition: (Starting)**
+
+|Edition|Home|Pro|Pro for Workstations|Pro Education|Education|Enterprise LTSC|Enterprise|
+|--- |--- |--- |--- |--- |--- |--- |--- |
+|Home||||||||
+|Pro||||||||
+|Pro for Workstations||||||||
+|Pro Education||||||||
+|Education||✔|✔|✔|||S|
+|Enterprise LTSC||||||||
+|Enterprise||✔|✔|✔|S|||
->
> **Windows N/KN**: Windows "N" and "KN" SKUs follow the same rules shown above.
Some slightly more complex scenarios are not represented by the table above. For example, you can perform an upgrade from Pro to Pro for Workstation on a computer with an embedded Pro key using a Pro for Workstation license key, and then later downgrade this computer back to Pro with the firmware-embedded key. The downgrade is allowed but only because the pre-installed OS is Pro.
@@ -247,4 +170,4 @@ Some slightly more complex scenarios are not represented by the table above. For
[Windows 10 upgrade paths](./windows-10-upgrade-paths.md)
[Windows 10 volume license media](../windows-10-media.md)
-[Windows 10 Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation)
\ No newline at end of file
+[Windows 10 Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation)
diff --git a/windows/deployment/wds-boot-support.md b/windows/deployment/wds-boot-support.md
index b8352c8389..d63a5a3512 100644
--- a/windows/deployment/wds-boot-support.md
+++ b/windows/deployment/wds-boot-support.md
@@ -28,64 +28,16 @@ When you PXE-boot from a WDS server that uses the **boot.wim** file from install
## Deployment scenarios affected
-The table below provides support details for specific deployment scenarios.
+The table below provides support details for specific deployment scenarios (Boot Image Version).
+
+||Windows 10|Windows Server 2016|Windows Server 2019|Windows Server 2022|Windows 11|
+|--- |--- |--- |--- |--- |--- |
+|**Windows 10**|Supported, using a boot image from matching or newer version.|Supported, using a boot image from Windows 10, version 1607 or later.|Supported, using a boot image from Windows 10, version 1809 or later.|Not supported.|Not supported.|
+|**Windows Server 2016**|Supported, using a boot image from Windows 10, version 1607 or later.|Supported.|Not supported.|Not supported.|Not supported.|
+|**Windows Server 2019**|Supported, using a boot image from Windows 10, version 1809 or later.|Supported.|Supported.|Not supported.|Not supported.|
+|**Windows Server 2022**|Deprecated, with a warning message.|Deprecated, with a warning message.|Deprecated, with a warning message.|Deprecated, with a warning message.|Not supported.|
+|**Windows 11**|Not supported, blocked.|Not supported, blocked.|Not supported, blocked.|Not supported, blocked.|Not supported, blocked.|
-
-
-
- | |
- |
- Windows 10 |
- Windows Server 2016 |
- Windows Server 2019 |
- Windows Server 2022 |
- Windows 11 |
-
-
-
-
Boot image version |
-
-
- | Windows 10 |
- Supported, using a boot image from matching or newer version. |
- Supported, using a boot image from Windows 10, version 1607 or later. |
- Supported, using a boot image from Windows 10, version 1809 or later. |
- Not supported. |
- Not supported. |
-
-
- | Windows Server 2016 |
- Supported, using a boot image from Windows 10, version 1607 or later. |
- Supported. |
- Not supported. |
- Not supported. |
- Not supported. |
-
-
- | Windows Server 2019 |
- Supported, using a boot image from Windows 10, version 1809 or later. |
- Supported. |
- Supported. |
- Not supported. |
- Not supported. |
-
-
- | Windows Server 2022 |
- Deprecated, with a warning message. |
- Deprecated, with a warning message. |
- Deprecated, with a warning message. |
- Deprecated, with a warning message. |
- Not supported. |
-
-
- | Windows 11 |
- Not supported, blocked. |
- Not supported, blocked. |
- Not supported, blocked. |
- Not supported, blocked. |
- Not supported, blocked. |
-
-
## Reason for the change
diff --git a/windows/deployment/windows-10-deployment-scenarios.md b/windows/deployment/windows-10-deployment-scenarios.md
index 098cf03790..8dd6d2f734 100644
--- a/windows/deployment/windows-10-deployment-scenarios.md
+++ b/windows/deployment/windows-10-deployment-scenarios.md
@@ -19,127 +19,46 @@ ms.collection: highpri
# Windows 10 deployment scenarios
**Applies to**
+
- Windows 10
To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the capabilities and limitations of each, is a key task.
-The following table summarizes various Windows 10 deployment scenarios. The scenarios are each assigned to one of three categories.
+## Deployment categories
+
+The following tables summarize various Windows 10 deployment scenarios. The scenarios are each assigned to one of three categories.
+
- Modern deployment methods are recommended unless you have a specific need to use a different procedure. These methods are supported with existing tools such as Microsoft Deployment Toolkit (MDT) and Microsoft Endpoint Configuration Manager. These methods are discussed in detail on the [Modern Desktop Deployment Center](/microsoft-365/enterprise/desktop-deployment-center-home).
- - Note: Once you have deployed Windows 10 in your organization, it is important to stay up to date by [creating a deployment plan](update/create-deployment-plan.md) for Windows 10 feature updates.
-- Dynamic deployment methods enable you to configure applications and settings for specific use cases.
-- Traditional deployment methods use existing tools to deploy operating system images.
-
- | Category |
- Scenario |
- Description |
- More information |
- | Modern |
-
+ > [!NOTE]
+ > Once you have deployed Windows 10 in your organization, it is important to stay up to date by [creating a deployment plan](update/create-deployment-plan.md) for Windows 10 feature updates.
-[Windows Autopilot](#windows-autopilot) |
-
- Customize the out-of-box-experience (OOBE) for your organization, and deploy a new system with apps and settings already configured.
- |
-
-Overview of Windows Autopilot
- |
-
-
- |
+- Dynamic deployment methods enable you to configure applications and settings for specific use cases.
-[In-place upgrade](#in-place-upgrade)
+- Traditional deployment methods use existing tools to deploy operating system images.
- |
-
- Use Windows Setup to update your OS and migrate apps and settings. Rollback data is saved in Windows.old.
- |
-
-Perform an in-place upgrade to Windows 10 with MDT
Perform an in-place upgrade to Windows 10 using Configuration Manager
- |
-
-
- |
- Dynamic
- |
-
+### Modern
-[Subscription Activation](#windows-10-subscription-activation)
- |
-
- Switch from Windows 10 Pro to Enterprise when a subscribed user signs in.
- |
-
-Windows 10 Subscription Activation
- |
-
-
-
+|Scenario|Description|More information|
+|--- |--- |--- |
+|[Windows Autopilot](#windows-autopilot)|Customize the out-of-box-experience (OOBE) for your organization, and deploy a new system with apps and settings already configured|[Overview of Windows Autopilot](/windows/deployment/windows-autopilot/windows-10-autopilot)|
+|[In-place upgrade](#in-place-upgrade)|Use Windows Setup to update your OS and migrate apps and settings. Rollback data is saved in Windows.old.|[Perform an in-place upgrade to Windows 10 with MDT](/windows/deployment/deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit)
[Perform an in-place upgrade to Windows 10 using Configuration Manager](/windows/deployment/deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager)|
- [AAD / MDM](#dynamic-provisioning)
- |
-
- The device is automatically joined to AAD and configured by MDM.
- |
-
-Azure Active Directory integration with MDM
- |
-
-
- |
+### Dynamic
- [Provisioning packages](#dynamic-provisioning)
- |
-
- Using the Windows Imaging and Configuration Designer tool, create provisioning packages that can be applied to devices.
- |
-
-Configure devices without MDM
- |
-
-
- |
- Traditional
- |
-
+|Scenario|Description|More information|
+|--- |--- |--- |
+|[Subscription Activation](#windows-10-subscription-activation)|Switch from Windows 10 Pro to Enterprise when a subscribed user signs in.|[Windows 10 Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation)|
+|[AAD / MDM](#dynamic-provisioning)|The device is automatically joined to AAD and configured by MDM.|[Azure Active Directory integration with MDM](/windows/client-management/mdm/azure-active-directory-integration-with-mdm)|
+|[Provisioning packages](#dynamic-provisioning)|Using the Windows Imaging and Configuration Designer tool, create provisioning packages that can be applied to devices.|[Configure devices without MDM](/windows/configuration/configure-devices-without-mdm)|
- [Bare metal](#new-computer)
- |
-
- Deploy a new device, or wipe an existing device and deploy with a fresh image.
- |
-
- Deploy a Windows 10 image using MDT
Deploy Windows 10 using PXE and Configuration Manager
- |
-
-
- |
-
- [Refresh](#computer-refresh)
- |
-
- Also called wipe and load. Redeploy a device by saving the user state, wiping the disk, then restoring the user state.
- |
-
- Refresh a Windows 7 computer with Windows 10
Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager
- |
-
-
- |
-
- [Replace](#computer-replace)
- |
-
- Replace an existing device with a new one by saving the user state on the old device and then restoring it to the new device.
- |
-
- Replace a Windows 7 computer with a Windows 10 computer
Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager
- |
-
-
-
-
+### Traditional
+|Scenario|Description|More information|
+|--- |--- |--- |
+|[Bare metal](#new-computer)|Deploy a new device, or wipe an existing device and deploy with a fresh image. |[Deploy a Windows 10 image using MDT](/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt)
[Deploy Windows 10 using PXE and Configuration Manager](/windows/deployment/deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager)|
+|[Refresh](#computer-refresh)|Also called wipe and load. Redeploy a device by saving the user state, wiping the disk, then restoring the user state. | [Refresh a Windows 7 computer with Windows 10](/windows/deployment/deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10)
[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](/windows/deployment/deploy-windows-cm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager)|
+|[Replace](#computer-replace)|Replace an existing device with a new one by saving the user state on the old device and then restoring it to the new device.| [Replace a Windows 7 computer with a Windows 10 computer](/windows/deployment/deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer)
[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](/windows/deployment/deploy-windows-cm/replace-a-windows-7-client-with-windows-10-using-configuration-manager)|
>[!IMPORTANT]
>The Windows Autopilot and Subscription Activation scenarios require that the beginning OS be Windows 10 version 1703, or later.
@@ -176,8 +95,11 @@ Scenarios that support in-place upgrade with some additional procedures include
There are some situations where you cannot use in-place upgrade; in these situations, you can use traditional deployment (wipe-and-load) instead. Examples of these situations include:
- Changing from Windows 7, Windows 8, or Windows 8.1 x86 to Windows 10 x64. The upgrade process cannot change from a 32-bit operating system to a 64-bit operating system, because of possible complications with installed applications and drivers.
+
- Windows To Go and Boot from VHD installations. The upgrade process is unable to upgrade these installations. Instead, new installations would need to be performed.
+
- Updating existing images. While it might be tempting to try to upgrade existing Windows 7, Windows 8, or Windows 8.1 images to Windows 10 by installing the old image, upgrading it, and then recapturing the new Windows 10 image, this is not supported – preparing an upgraded OS for imaging (using Sysprep.exe) is not supported and will not work when it detects the upgraded OS.
+
- Dual-boot and multi-boot systems. The upgrade process is designed for devices running a single OS; if using dual-boot or multi-boot systems with multiple operating systems (not leveraging virtual machines for the second and subsequent operating systems), additional care should be taken.
diff --git a/windows/deployment/windows-10-poc-mdt.md b/windows/deployment/windows-10-poc-mdt.md
index c59e537d48..6cc78efe42 100644
--- a/windows/deployment/windows-10-poc-mdt.md
+++ b/windows/deployment/windows-10-poc-mdt.md
@@ -25,7 +25,8 @@ ms.topic: article
- Windows 10
-**Important**: This guide leverages the proof of concept (PoC) environment configured using procedures in the following guide:
+> [!IMPORTANT]
+> This guide leverages the proof of concept (PoC) environment configured using procedures in the following guide:
- [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md)
Please complete all steps in the prerequisite guide before starting this guide. This guide requires about 5 hours to complete, but can require less time or more time depending on the speed of the Hyper-V host. After completing the current guide, also see the companion guide:
@@ -36,7 +37,7 @@ The PoC environment is a virtual network running on Hyper-V with three virtual m
- **SRV1**: A dual-homed contoso.com domain member server, DNS server, and default gateway providing NAT service for the PoC network.
- **PC1**: A contoso.com member computer running Windows 7, Windows 8, or Windows 8.1 that has been shadow-copied from a physical computer on your corporate network.
->This guide uses the Hyper-V server role. If you do not complete all steps in a single session, consider using [checkpoints](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn818483(v=ws.11)) and [saved states](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/ee247418(v=ws.10)) to pause, resume, or restart your work.
+This guide uses the Hyper-V server role. If you do not complete all steps in a single session, consider using [checkpoints](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/dn818483(v=ws.11)) and [saved states](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/ee247418(v=ws.10)) to pause, resume, or restart your work.
## In this guide
@@ -44,23 +45,15 @@ This guide provides instructions to install and configure the Microsoft Deployme
Topics and procedures in this guide are summarized in the following table. An estimate of the time required to complete each procedure is also provided. Time required to complete procedures will vary depending on the resources available to the Hyper-V host and assigned to VMs, such as processor speed, memory allocation, disk speed, and network speed.
-
-
-
+|Topic|Description|Time|
+|--- |--- |--- |
+|[About MDT](#about-mdt)|A high-level overview of the Microsoft Deployment Toolkit (MDT).|Informational|
+|[Install MDT](#install-mdt)|Download and install MDT.|40 minutes|
+|[Create a deployment share and reference image](#create-a-deployment-share-and-reference-image)|A reference image is created to serve as the template for deploying new images.|90 minutes|
+|[Deploy a Windows 10 image using MDT](#deploy-a-windows-10-image-using-mdt)|The reference image is deployed in the PoC environment.|60 minutes|
+|[Refresh a computer with Windows 10](#refresh-a-computer-with-windows-10)|Export user data from an existing client computer, wipe the computer, install a new operating system, and then restore user data and settings.|60 minutes|
+|[Replace a computer with Windows 10](#replace-a-computer-with-windows-10)|Back up an existing client computer, then restore this backup to a new computer.|60 minutes|
+|[Troubleshooting logs, events, and utilities](#troubleshooting-logs-events-and-utilities)|Log locations and troubleshooting hints.|Informational|
## About MDT
@@ -73,18 +66,19 @@ MDT performs deployments by using the Lite Touch Installation (LTI), Zero Touch
1. On SRV1, temporarily disable IE Enhanced Security Configuration for Administrators by typing the following commands at an elevated Windows PowerShell prompt:
- ```
+ ```powershell
$AdminKey = "HKLM:\SOFTWARE\Microsoft\Active Setup\Installed Components\{A509B1A7-37EF-4b3f-8CFC-4F3A74704073}"
Set-ItemProperty -Path $AdminKey -Name “IsInstalled” -Value 0
Stop-Process -Name Explorer
```
+
2. Download and install the 64-bit version of [Microsoft Deployment Toolkit (MDT)](https://www.microsoft.com/download/details.aspx?id=54259) on SRV1 using the default options. As of the writing of this guide, the latest version of MDT was 8443.
3. Download and install the latest [Windows Assessment and Deployment Kit (ADK)](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit) on SRV1 using the default installation settings. The current version is the ADK for Windows 10, version 1703. Installation might require several minutes to acquire all components.
3. If desired, re-enable IE Enhanced Security Configuration:
- ```
+ ```powershell
Set-ItemProperty -Path $AdminKey -Name “IsInstalled” -Value 1
Stop-Process -Name Explorer
```
@@ -95,7 +89,7 @@ A reference image serves as the foundation for Windows 10 devices in your organi
1. In [Step by step guide: Configure a test lab to deploy Windows 10](windows-10-poc.md), the Windows 10 Enterprise .iso file was saved to the c:\VHD directory as **c:\VHD\w10-enterprise.iso**. The first step in creating a deployment share is to mount this file on SRV1. To mount the Windows 10 Enterprise DVD on SRV1, open an elevated Windows PowerShell prompt on the Hyper-V host computer and type the following command:
- ```
+ ```powershell
Set-VMDvdDrive -VMName SRV1 -Path c:\VHD\w10-enterprise.iso
```
2. On SRV1, verify that the Windows Enterprise installation DVD is mounted as drive letter D.
@@ -130,7 +124,7 @@ A reference image serves as the foundation for Windows 10 devices in your organi
- Progress: wait for files to be copied
- Confirmation: click **Finish**
- >For purposes of this test lab, we will only add the prerequisite .NET Framework feature. Commerical applications (ex: Microsoft Office) will not be added to the deployment share. For information about adding applications, see the [Add applications](./deploy-windows-mdt/create-a-windows-10-reference-image.md) section of the [Create a Windows 10 reference image](deploy-windows-mdt/create-a-windows-10-reference-image.md) topic in the TechNet library.
+ For purposes of this test lab, we will only add the prerequisite .NET Framework feature. Commerical applications (ex: Microsoft Office) will not be added to the deployment share. For information about adding applications, see the [Add applications](./deploy-windows-mdt/create-a-windows-10-reference-image.md) section of the [Create a Windows 10 reference image](deploy-windows-mdt/create-a-windows-10-reference-image.md) topic in the TechNet library.
11. The next step is to create a task sequence to reference the operating system that was imported. To create a task sequence, right-click the **Task Sequences** node and then click **New Task Sequence**. Use the following settings for the New Task Sequence Wizard:
- Task sequence ID: **REFW10X64-001**
@@ -141,7 +135,7 @@ A reference image serves as the foundation for Windows 10 devices in your organi
- Specify Product Key: **Do not specify a product key at this time**
- Full Name: **Contoso**
- Organization: **Contoso**
- - Internet Explorer home page: **http://www.contoso.com**
+ - Internet Explorer home page: `http://www.contoso.com`
- Admin Password: **Do not specify an Administrator password at this time**
- Summary: click **Next**
- Confirmation: click **Finish**
@@ -159,7 +153,8 @@ A reference image serves as the foundation for Windows 10 devices in your organi
17. Enable Windows Update in the task sequence by clicking the **Windows Update (Post-Application Installation)** step, clicking the **Options** tab, and clearing the **Disable this step** checkbox.
- >Note: Since we are not installing applications in this test lab, there is no need to enable the Windows Update Pre-Application Installation step. However, you should enable this step if you are also installing applications.
+ > [!NOTE]
+ > Since we are not installing applications in this test lab, there is no need to enable the Windows Update Pre-Application Installation step. However, you should enable this step if you are also installing applications.
18. Click **OK** to complete editing the task sequence.
@@ -167,7 +162,7 @@ A reference image serves as the foundation for Windows 10 devices in your organi
20. Replace the default rules with the following text:
- ```
+ ```text
[Settings]
Priority=Default
@@ -202,7 +197,7 @@ A reference image serves as the foundation for Windows 10 devices in your organi
21. Click **Apply** and then click **Edit Bootstrap.ini**. Replace the contents of the Bootstrap.ini file with the following text, and save the file:
- ```
+ ```text
[Settings]
Priority=Default
@@ -222,20 +217,18 @@ A reference image serves as the foundation for Windows 10 devices in your organi
25. Copy **c:\MDTBuildLab\Boot\LiteTouchPE_x86.iso** on SRV1 to the **c:\VHD** directory on the Hyper-V host computer. Note that in MDT, the x86 boot image can deploy both x86 and x64 operating systems, except on computers based on Unified Extensible Firmware Interface (UEFI).
- >Hint: To copy the file, right-click the **LiteTouchPE_x86.iso** file and click **Copy** on SRV1, then open the **c:\VHD** folder on the Hyper-V host, right-click inside the folder and click **Paste**.
+ > [!TIP]
+ > To copy the file, right-click the **LiteTouchPE_x86.iso** file and click **Copy** on SRV1, then open the **c:\VHD** folder on the Hyper-V host, right-click inside the folder and click **Paste**.
26. Open a Windows PowerShell prompt on the Hyper-V host computer and type the following commands:
-
-
-
+ ```powershell
New-VM REFW10X64-001 -SwitchName poc-internal -NewVHDPath "c:\VHD\REFW10X64-001.vhdx" -NewVHDSizeBytes 60GB
Set-VMMemory REFW10X64-001 -DynamicMemoryEnabled $true -MinimumBytes 1024MB -MaximumBytes 1024MB -Buffer 20
Set-VMDvdDrive REFW10X64-001 -Path c:\VHD\LiteTouchPE_x86.iso
Start-VM REFW10X64-001
vmconnect localhost REFW10X64-001
-
-
2. Click **OK**, right-click **MDT Production**, click **Update Deployment Share** and accept the default options in the wizard to update the share.
3. Type the following commands at an elevated Windows PowerShell prompt on SRV1:
- ```
+ ```powershell
New-Item -Path C:\MigData -ItemType directory
New-SmbShare -Name MigData$ -Path C:\MigData -ChangeAccess EVERYONE
icacls C:\MigData /grant '"contoso\administrator":(OI)(CI)(M)'
```
+
4. On SRV1 in the deployment workbench, under **MDT Production**, right-click the **Task Sequences** node, and click **New Folder**.
5. Name the new folder **Other**, and complete the wizard using default options.
6. Right-click the **Other** folder and then click **New Task Sequence**. Use the following values in the wizard:
@@ -556,21 +558,22 @@ At a high level, the computer replace process consists of:
1. If you are not already signed on to PC1 as **contoso\administrator**, sign in using this account. To verify the currently signed in account, type the following command at an elevated command prompt:
- ```
+ ```console
whoami
```
2. To ensure a clean environment before running the backup task sequence, type the following at an elevated Windows PowerShell prompt on PC1:
- ```
+ ```powershell
Remove-Item c:\minint -recurse
Remove-Item c:\_SMSTaskSequence -recurse
Restart-Computer
```
3. Sign in to PC1 using the contoso\administrator account, and then type the following at an elevated command prompt:
- ```
+ ```console
cscript \\SRV1\MDTProd$\Scripts\Litetouch.vbs
```
+
4. Complete the deployment wizard using the following:
- **Task Sequence**: Backup Only Task Sequence
- **User Data**: Specify a location: **\\\\SRV1\MigData$\PC1**
@@ -579,7 +582,7 @@ At a high level, the computer replace process consists of:
6. On PC1, verify that **The user state capture was completed successfully** is displayed, and click **Finish** when the capture is complete.
7. On SRV1, verify that the file **USMT.MIG** was created in the **C:\MigData\PC1\USMT** directory. See the following example:
- ```
+ ```powershell
PS C:\> dir C:\MigData\PC1\USMT
Directory: C:\MigData\PC1\USMT
@@ -588,49 +591,52 @@ At a high level, the computer replace process consists of:
---- ------------- ------ ----
-a--- 9/6/2016 11:34 AM 14248685 USMT.MIG
```
- ### Deploy PC3
-8. On the Hyper-V host, type the following commands at an elevated Windows PowerShell prompt:
+### Deploy PC3
- ```
+1. On the Hyper-V host, type the following commands at an elevated Windows PowerShell prompt:
+
+ ```powershell
New-VM –Name "PC3" –NewVHDPath "c:\vhd\pc3.vhdx" -NewVHDSizeBytes 60GB -SwitchName poc-internal -BootDevice NetworkAdapter -Generation 2
Set-VMMemory -VMName "PC3" -DynamicMemoryEnabled $true -MinimumBytes 512MB -MaximumBytes 2048MB -Buffer 20
```
-9. Temporarily disable the external network adapter on SRV1 again, so that we can successfully boot PC3 from WDS. To disable the adapter, type the following command at an elevated Windows PowerShell prompt on SRV1:
- ```
+2. Temporarily disable the external network adapter on SRV1 again, so that we can successfully boot PC3 from WDS. To disable the adapter, type the following command at an elevated Windows PowerShell prompt on SRV1:
+
+ ```powershell
Disable-NetAdapter "Ethernet 2" -Confirm:$false
```
- >As mentioned previously, ensure that you disable the **external** network adapter, and wait for the command to complete before proceeding.
+ As mentioned previously, ensure that you disable the **external** network adapter, and wait for the command to complete before proceeding.
-10. Start and connect to PC3 by typing the following commands at an elevated Windows PowerShell prompt on the Hyper-V host:
+3. Start and connect to PC3 by typing the following commands at an elevated Windows PowerShell prompt on the Hyper-V host:
- ```
+ ```powershell
Start-VM PC3
vmconnect localhost PC3
```
-11. When prompted, press ENTER for network boot.
+4. When prompted, press ENTER for network boot.
-12. On PC3, use the following settings for the Windows Deployment Wizard:
+5. On PC3, use the following settings for the Windows Deployment Wizard:
- **Task Sequence**: Windows 10 Enterprise x64 Custom Image
- **Move Data and Settings**: Do not move user data and settings
- **User Data (Restore)**: Specify a location: **\\\\SRV1\MigData$\PC1**
-13. When OS installation has started on PC1, re-enable the external network adapter on SRV1 by typing the following command on SRV1:
+6. When OS installation has started on PC1, re-enable the external network adapter on SRV1 by typing the following command on SRV1:
- ```
+ ```powershell
Enable-NetAdapter "Ethernet 2"
```
-14. Setup will install the Windows 10 Enterprise operating system, update via Windows Update, and restore the user settings and data from PC1.
-15. When PC3 has completed installing the OS, sign in to PC3 using the contoso\administrator account. When the PC completes updating, click **Finish**.
+7. Setup will install the Windows 10 Enterprise operating system, update via Windows Update, and restore the user settings and data from PC1.
-16. Verify that settings have been migrated from PC1. This completes demonstration of the replace procedure.
+8. When PC3 has completed installing the OS, sign in to PC3 using the contoso\administrator account. When the PC completes updating, click **Finish**.
-17. Shut down PC3 in preparation for the [next](windows-10-poc-sc-config-mgr.md) procedure.
+9. Verify that settings have been migrated from PC1. This completes demonstration of the replace procedure.
+
+10. Shut down PC3 in preparation for the [next](windows-10-poc-sc-config-mgr.md) procedure.
## Troubleshooting logs, events, and utilities
diff --git a/windows/deployment/windows-10-poc.md b/windows/deployment/windows-10-poc.md
index 3855f4698d..fe437a325e 100644
--- a/windows/deployment/windows-10-poc.md
+++ b/windows/deployment/windows-10-poc.md
@@ -39,6 +39,7 @@ Approximately 3 hours are required to configure the PoC environment. You will ne
Windows PowerShell commands are provided to set up the PoC environment quickly. You do not need to be an expert in Windows PowerShell to complete the steps in the guide, however you are required to customize some commands to your environment.
+> [!TIP]
> Instructions to "type" Windows PowerShell commands provided in this guide can be followed literally by typing the commands, but the preferred method is to copy and paste these commands.
>
> A Windows PowerShell window can be used to run all commands in this guide. However, when commands are specified for a command prompt, you must either type CMD at the Windows PowerShell prompt to enter the command prompt, or preface the command with "cmd /c", or if desired you can escape special characters in the command using the back-tick character (`). In most cases, the simplest thing is to type cmd and enter a command prompt, type the necessary commands, then type "exit" to return to Windows PowerShell.
@@ -53,26 +54,22 @@ After completing the instructions in this guide, you will have a PoC environment
Topics and procedures in this guide are summarized in the following table. An estimate of the time required to complete each procedure is also provided. Time required to complete procedures will vary depending on the resources available to the Hyper-V host and assigned to VMs, such as processor speed, memory allocation, disk speed, and network speed.
-
+
-
+|Topic|Description|Time|
+|--- |--- |--- |
+|[Hardware and software requirements](#hardware-and-software-requirements)|Prerequisites to complete this guide.|Informational|
+|[Lab setup](#lab-setup)|A description and diagram of the PoC environment.|Informational|
+|[Configure the PoC environment](#configure-the-poc-environment)|Parent topic for procedures.|Informational|
+|[Verify support and install Hyper-V](#verify-support-and-install-hyper-v)|Verify that installation of Hyper-V is supported, and install the Hyper-V server role.|10 minutes|
+|[Download VHD and ISO files](#download-vhd-and-iso-files)|Download evaluation versions of Windows Server 2012 R2 and Windows 10 and prepare these files to be used on the Hyper-V host.|30 minutes|
+|[Convert PC to VM](#convert-pc-to-vm)|Convert a physical computer on your network to a VM hosted in Hyper-V.|30 minutes|
+|[Resize VHD](#resize-vhd)|Increase the storage capacity for one of the Windows Server VMs.|5 minutes|
+|[Configure Hyper-V](#configure-hyper-v)|Create virtual switches, determine available RAM for virtual machines, and add virtual machines.|15 minutes|
+|[Configure service and user accounts](#configure-vms)|Start virtual machines and configure all services and settings.|60 minutes|
+|[Configure VMs](#configure-vms)|Start virtual machines and configure all services and settings.|60 minutes|
+|[Appendix A: Verify the configuration](#appendix-a-verify-the-configuration)|Verify and troubleshoot network connectivity and services in the PoC environment.|30 minutes|
+|[Appendix B: Terminology in this guide](#appendix-b-terminology-used-in-this-guide)|Terms used in this guide.|Informational|
## Hardware and software requirements
@@ -83,68 +80,25 @@ One computer that meets the hardware and software specifications below is requir
Hardware requirements are displayed below:
-
-
-
-
- |
- Computer 1 (required) |
- Computer 2 (recommended) |
-
-
- | Role |
- Hyper-V host |
- Client computer |
-
-
- | Description |
- This computer will run Hyper-V, the Hyper-V management tools, and the Hyper-V Windows PowerShell module. |
- This computer is a Windows 7 or Windows 8/8.1 client on your corporate network that will be converted to a VM to demonstrate the upgrade process. |
-
-
- | OS |
- Windows 8.1/10 or Windows Server 2012/2012 R2/2016* |
- Windows 7 or a later |
-
-
- | Edition |
- Enterprise, Professional, or Education |
- Any |
-
-
- | Architecture |
- 64-bit |
- Any
Note: Retaining applications and settings requires that architecture (32 or 64-bit) is the same before and after the upgrade. |
-
-
- | RAM |
- 8 GB RAM (16 GB recommended) to test Windows 10 deployment with MDT.
-
16 GB RAM to test Windows 10 deployment with Microsoft Endpoint Configuration Manager. |
- Any |
-
-
- | Disk |
- 200 GB available hard disk space, any format. |
- Any size, MBR formatted. |
-
-
- | CPU |
- SLAT-Capable CPU |
- Any |
-
-
- | Network |
- Internet connection |
- Any |
-
-
+
+||Computer 1 (required)|Computer 2 (recommended)|
+|--- |--- |--- |
+|**Role**|Hyper-V host|Client computer|
+|**Description**|This computer will run Hyper-V, the Hyper-V management tools, and the Hyper-V Windows PowerShell module.|This computer is a Windows 7 or Windows 8/8.1 client on your corporate network that will be converted to a VM to demonstrate the upgrade process.|
+|**OS**|Windows 8.1/10 or Windows Server 2012/2012 R2/2016*|Windows 7 or a later|
+|**Edition**|Enterprise, Professional, or Education|Any|
+|**Architecture**|64-bit|Any
*Note: Retaining applications and settings requires that architecture (32 or 64-bit) is the same before and after the upgrade.*|
+|**RAM**|8 GB RAM (16 GB recommended) to test Windows 10 deployment with MDT.
16 GB RAM to test Windows 10 deployment with Microsoft Endpoint Configuration Manager.|Any|
+|**Disk**|200 GB available hard disk space, any format.|Any size, MBR formatted.|
+|**CPU**|SLAT-Capable CPU|Any|
+|**Network**|Internet connection|Any|
\*The Hyper-V server role can also be installed on a computer running Windows Server 2008 R2. However, the Windows PowerShell module for Hyper-V is not available on Windows Server 2008 R2, therefore you cannot use many of the steps provided in this guide to configure Hyper-V. To manage Hyper-V on Windows Server 2008 R2, you can use Hyper-V WMI, or you can use the Hyper-V Manager console. Providing all steps in this guide as Hyper-V WMI or as 2008 R2 Hyper-V Manager procedures is beyond the scope of the guide.
-
-
The Hyper-V role cannot be installed on Windows 7 or earlier versions of Windows.
-
+ ```console
C:\>systeminfo
...
@@ -187,7 +143,7 @@ Starting with Windows 8, the host computer’s microprocessor must support secon
Virtualization Enabled In Firmware: Yes
Second Level Address Translation: Yes
Data Execution Prevention Available: Yes
-
+ ```
In this example, the computer supports SLAT and Hyper-V.
@@ -195,7 +151,7 @@ Starting with Windows 8, the host computer’s microprocessor must support secon
You can also identify Hyper-V support using [tools](/archive/blogs/taylorb/hyper-v-will-my-computer-run-hyper-v-detecting-intel-vt-and-amd-v) provided by the processor manufacturer, the [msinfo32](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/cc731397(v=ws.11)) tool, or you can download the [coreinfo](/sysinternals/downloads/coreinfo) utility and run it, as shown in the following example:
-
+ ```console
C:\>coreinfo -v
Coreinfo v3.31 - Dump information on system CPU and memory topology
@@ -208,27 +164,32 @@ Starting with Windows 8, the host computer’s microprocessor must support secon
HYPERVISOR - Hypervisor is present
VMX * Supports Intel hardware-assisted virtualization
EPT * Supports Intel extended page tables (SLAT)
-
+ ```
- Note: A 64-bit operating system is required to run Hyper-V.
+ > [!NOTE]
+ > A 64-bit operating system is required to run Hyper-V.
2. The Hyper-V feature is not installed by default. To install it, open an elevated Windows PowerShell window and type the following command:
- Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
+ ```powershell
+ Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
+ ```
This command works on all operating systems that support Hyper-V, but on Windows Server operating systems you must type an additional command to add the Hyper-V Windows PowerShell module and the Hyper-V Manager console. This command will also install Hyper-V if it isn't already installed, so if desired you can just type the following command on Windows Server 2012 or 2016 instead of using the Enable-WindowsOptionalFeature command:
- Install-WindowsFeature -Name Hyper-V -IncludeManagementTools
+ ```powershell
+ Install-WindowsFeature -Name Hyper-V -IncludeManagementTools
+ ```
When you are prompted to restart the computer, choose **Yes**. The computer might restart more than once. After installation is complete, you can open Hyper-V Manager by typing **virtmgmt.msc** at an elevated command prompt.
- >Alternatively, you can install Hyper-V using the Control Panel in Windows under **Turn Windows features on or off** for a client operating system, or using Server Manager's **Add Roles and Features Wizard** on a server operating system, as shown below:
+ Alternatively, you can install Hyper-V using the Control Panel in Windows under **Turn Windows features on or off** for a client operating system, or using Server Manager's **Add Roles and Features Wizard** on a server operating system, as shown below:
- If you choose to install Hyper-V using Server Manager, accept all default selections. Also be sure to install both items under Role Administration Tools\Hyper-V Management Tools.
+ If you choose to install Hyper-V using Server Manager, accept all default selections. Also be sure to install both items under Role Administration Tools\Hyper-V Management Tools.
### Download VHD and ISO files
@@ -236,63 +197,65 @@ When you have completed installation of Hyper-V on the host computer, begin conf
1. Create a directory on your Hyper-V host named **C:\VHD** and download a single [Windows Server 2012 R2 VHD](https://www.microsoft.com/evalcenter/evaluate-windows-server-2012-r2) from the TechNet Evaluation Center to the **C:\VHD** directory.
- **Important**: This guide assumes that VHDs are stored in the **C:\VHD** directory on the Hyper-V host. If you use a different directory to store VHDs, you must adjust steps in this guide appropriately.
+ > [!IMPORTANT]
+ > This guide assumes that VHDs are stored in the **C:\VHD** directory on the Hyper-V host. If you use a different directory to store VHDs, you must adjust steps in this guide appropriately.
After completing registration you will be able to download the 7.47 GB Windows Server 2012 R2 evaluation VHD. An example of the download offering is shown below.
-
-  |
-
+ :::image type="content" alt-text="VHD" source="images/download_vhd.png":::
2. Download the file to the **C:\VHD** directory. When the download is complete, rename the VHD file that you downloaded to **2012R2-poc-1.vhd**. This is done to make the filename simple to recognize and type.
+
3. Copy the VHD to a second file also in the **C:\VHD** directory and name this VHD **2012R2-poc-2.vhd**.
+
4. Download the [Windows 10 Enterprise ISO](https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise) from the TechNet Evaluation Center to the **C:\VHD** directory on your Hyper-V host.
- >During registration, you must specify the type, version, and language of installation media to download. In this example, a Windows 10 Enterprise, 64 bit, English ISO is chosen. You can choose a different version if desired. **Note: The evaluation version of Windows 10 does not support in-place upgrade**.
+ During registration, you must specify the type, version, and language of installation media to download. In this example, a Windows 10 Enterprise, 64 bit, English ISO is chosen. You can choose a different version if desired.
+
+ > [!NOTE]
+ > The evaluation version of Windows 10 does not support in-place upgrade**.
5. Rename the ISO file that you downloaded to **w10-enterprise.iso**. Again, this is done so that the filename is simple to type and recognize. After completing registration you will be able to download the 3.63 GB Windows 10 Enterprise evaluation ISO.
-After completing these steps, you will have three files in the **C:\VHD** directory: **2012R2-poc-1.vhd**, **2012R2-poc-2.vhd**, **w10-enterprise.iso**.
+ After completing these steps, you will have three files in the **C:\VHD** directory: **2012R2-poc-1.vhd**, **2012R2-poc-2.vhd**, **w10-enterprise.iso**.
-The following displays the procedures described in this section, both before and after downloading files:
+ The following displays the procedures described in this section, both before and after downloading files:
-
-C:>mkdir VHD
-C:>cd VHD
-C:\VHD>ren 9600*.vhd 2012R2-poc-1.vhd
-C:\VHD>copy 2012R2-poc-1.vhd 2012R2-poc-2.vhd
- 1 file(s) copied.
-C:\VHD ren *.iso w10-enterprise.iso
-C:\VHD>dir /B
-2012R2-poc-1.vhd
-2012R2-poc-2.vhd
-w10-enterprise.iso
-
+ ```console
+ C:>mkdir VHD
+ C:>cd VHD
+ C:\VHD>ren 9600*.vhd 2012R2-poc-1.vhd
+ C:\VHD>copy 2012R2-poc-1.vhd 2012R2-poc-2.vhd
+ 1 file(s) copied.
+ C:\VHD ren *.iso w10-enterprise.iso
+ C:\VHD>dir /B
+ 2012R2-poc-1.vhd
+ 2012R2-poc-2.vhd
+ w10-enterprise.iso
+ ```
### Convert PC to VM
->Important: Do not attempt to use the VM resulting from the following procedure as a reference image. Also, to avoid conflicts with existing clients, do not start the VM outside the PoC network.
+> [!IMPORTANT]
+> Do not attempt to use the VM resulting from the following procedure as a reference image. Also, to avoid conflicts with existing clients, do not start the VM outside the PoC network.
-
If you do not have a PC available to convert to VM, perform the following steps to download an evaluation VM:
-
-
-- Open the Download virtual machines page.
-
- Under Virtual machine, choose IE11 on Win7.
-
- Under Select platform choose HyperV (Windows).
-
- Click Download .zip. The download is 3.31 GB.
-
- Extract the zip file. Three directories are created.
-
- Open the Virtual Hard Disks directory and then copy IE11 - Win7.vhd to the C:\VHD directory.
-
- Rename IE11 - Win7.vhd to w7.vhd (do not rename the file to w7.vhdx).
-
- In step 5 of the Configure Hyper-V section, replace the VHD file name w7.vhdx with w7.vhd.
-
- |
+
+1. Open the [Download virtual machines](https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/) page.
+2. Under **Virtual machine**, choose **IE11 on Win7**.
+3. Under **Select platform** choose **HyperV (Windows)**.
+4. Click **Download .zip**. The download is 3.31 GB.
+5. Extract the zip file. Three directories are created.
+6. Open the **Virtual Hard Disks** directory and then copy **IE11 - Win7.vhd** to the **C:\VHD** directory.
+7. Rename **IE11 - Win7.vhd** to **w7.vhd** (do not rename the file to w7.vhdx).
+8. In step 5 of the [Configure Hyper-V](#configure-hyper-v) section, replace the VHD file name **w7.vhdx** with **w7.vhd**.
If you have a PC available to convert to VM (computer 2):
1. Sign in on computer 2 using an account with Administrator privileges.
->Important: the account used in this step must have local administrator privileges. You can use a local computer account, or a domain account with administrative rights if domain policy allows the use of cached credentials. After converting the computer to a VM, you must be able to sign in on this VM with administrator rights while the VM is disconnected from the corporate network.
+ > [!IMPORTANT]
+ > The account used in this step must have local administrator privileges. You can use a local computer account, or a domain account with administrative rights if domain policy allows the use of cached credentials. After converting the computer to a VM, you must be able to sign in on this VM with administrator rights while the VM is disconnected from the corporate network.
2. [Determine the VM generation and partition type](#determine-the-vm-generation-and-partition-type) that is required.
3. Based on the VM generation and partition type, perform one of the following procedures: [Prepare a generation 1 VM](#prepare-a-generation-1-vm), [Prepare a generation 2 VM](#prepare-a-generation-2-vm), or [prepare a generation 1 VM from a GPT disk](#prepare-a-generation-1-vm-from-a-gpt-disk).
@@ -301,54 +264,34 @@ If you have a PC available to convert to VM (computer 2):
When creating a VM in Hyper-V, you must specify either generation 1 or generation 2. The following table describes requirements for these two types of VMs.
-
-
-
-
- |
- Architecture |
- Operating system |
- Partition style |
-
-
- | Generation 1 |
- 32-bit or 64-bit |
- Windows 7 or later |
- MBR |
-
-
- | Generation 2 |
- 64-bit |
- Windows 8 or later |
- MBR or GPT |
-
-
-
-
-Get-WmiObject -Class Win32_DiskPartition | Select-Object -Property SystemName,Caption,Type
-
+ ```powershell
+ Get-WmiObject -Class Win32_DiskPartition | Select-Object -Property SystemName,Caption,Type
+ ```
If the **Type** column does not indicate GPT, then the disk partition format is MBR ("Installable File System" = MBR). In the following example, the disk is GPT:
-
+```powershell
PS C:> Get-WmiObject -Class Win32_DiskPartition | Select-Object -Property SystemName,Caption,Type
SystemName Caption Type
---------- ------- ----
USER-PC1 Disk #0, Partition #0 GPT: System
USER-PC1 Disk #0, Partition #1 GPT: Basic Data
-
+```
On a computer running Windows 8 or later, you can also type **Get-Disk** at a Windows PowerShell prompt to discover the partition style. The default output of this cmdlet displays the partition style for all attached disks. Both commands are displayed below. In this example, the client computer is running Windows 8.1 and uses a GPT style partition format:
-
+```powershell
PS C:> Get-WmiObject -Class Win32_DiskPartition | Select-Object -Property SystemName,Caption,Type
SystemName Caption Type
@@ -364,176 +307,162 @@ PS C:> Get-Disk
Number Friendly Name OperationalStatus Total Size Partition Style
------ ------------- ----------------- ---------- ---------------
0 INTEL SSDSCMMW240A3L Online 223.57 GB GPT
-
+```
**Choosing a VM generation**
-The following table displays the Hyper-V VM generation to choose based on the OS, architecture, and partition style. Links to procedures to create the corresponding VMs are included.
+The following tables display the Hyper-V VM generation to choose based on the OS, architecture, and partition style. Links to procedures to create the corresponding VMs are included.
-
+**Windows 7 MBR**
-
+|Architecture|VM generation|Procedure|
+|--- |--- |--- |
+|32|1|[Prepare a generation 1 VM](#prepare-a-generation-1-vm)|
+|64|1|[Prepare a generation 1 VM](#prepare-a-generation-1-vm)|
-
-
-- If the PC is running Windows 7, it can only be converted and hosted in Hyper-V as a generation 1 VM. This Hyper-V requirement means that if the Windows 7 PC is also using a GPT partition style, the OS disk can be shadow copied, but a new system partition must be created. In this case, see Prepare a generation 1 VM from a GPT disk.
-
- If the PC is running Windows 8 or later and uses the GPT partition style, you can capture the disk image and create a generation 2 VM. To do this, you must temporarily mount the EFI system partition which is accomplished using the mountvol command. In this case, see Prepare a generation 2 VM.
-
- If the PC is using an MBR partition style, you can convert the disk to VHD and use it to create a generation 1 VM. If you use the Disk2VHD tool described in this guide, it is not necessary to mount the MBR system partition, but it is still necessary to capture it. In this case, see Prepare a generation 1 VM.
-
#### Prepare a generation 1 VM
1. Download the [Disk2vhd utility](/sysinternals/downloads/disk2vhd), extract the .zip file and copy **disk2vhd.exe** to a flash drive or other location that is accessible from the computer you wish to convert.
- >You might experience timeouts if you attempt to run Disk2vhd from a network share, or specify a network share for the destination. To avoid timeouts, use local, portable media such as a USB drive.
+ > [!TIP]
+ > You might experience timeouts if you attempt to run Disk2vhd from a network share, or specify a network share for the destination. To avoid timeouts, use local, portable media such as a USB drive.
2. On the computer you wish to convert, double-click the disk2vhd utility to start the graphical user interface.
-3. Select the checkboxes next to the **C:\\** and the **system reserved** (BIOS/MBR) volumes. The system volume is not assigned a drive letter, but will be displayed in the Disk2VHD tool with a volume label similar to **\\?\Volume{**. See the following example. **Important**: You must include the system volume in order to create a bootable VHD. If this volume is not displayed in the disk2vhd tool, then the computer is likely to be using the GPT partition style. For more information, see [Determine VM generation](#determine-vm-generation).
+
+3. Select the checkboxes next to the **C:\\** and the **system reserved** (BIOS/MBR) volumes. The system volume is not assigned a drive letter, but will be displayed in the Disk2VHD tool with a volume label similar to **\\?\Volume{**. See the following example.
+
+ > [!IMPORTANT]
+ > You must include the system volume in order to create a bootable VHD. If this volume is not displayed in the disk2vhd tool, then the computer is likely to be using the GPT partition style. For more information, see [Determine VM generation](#determine-vm-generation).
+
4. Specify a location to save the resulting VHD or VHDX file (F:\VHD\w7.vhdx in the following example) and click **Create**. See the following example:
- >Disk2vhd can save VHDs to local hard drives, even if they are the same as the volumes being converted. Performance is better however when the VHD is saved on a disk different than those being converted, such as a flash drive.
+ Disk2vhd can save VHDs to local hard drives, even if they are the same as the volumes being converted. Performance is better, however, when the VHD is saved on a disk different than those being converted, such as a flash drive.
5. When the Disk2vhd utility has completed converting the source computer to a VHD, copy the VHDX file (w7.vhdx) to your Hyper-V host in the C:\VHD directory. There should now be four files in this directory:
-
+ ```cmd
C:\vhd>dir /B
2012R2-poc-1.vhd
2012R2-poc-2.vhd
w10-enterprise.iso
w7.VHDX
-
+ ```
#### Prepare a generation 2 VM
1. Download the [Disk2vhd utility](/sysinternals/downloads/disk2vhd), extract the .zip file and copy **disk2vhd.exe** to a flash drive or other location that is accessible from the computer you wish to convert.
- >You might experience timeouts if you attempt to run Disk2vhd from a network share, or specify a network share for the destination. To avoid timeouts, use local, portable media such as a USB drive.
+ > [!TIP]
+ > You might experience timeouts if you attempt to run Disk2vhd from a network share, or specify a network share for the destination. To avoid timeouts, use local, portable media such as a USB drive.
2. On the computer you wish to convert, open an elevated command prompt and type the following command:
- mountvol s: /s
+ ```console
+ mountvol s: /s
+ ```
This command temporarily assigns a drive letter of S to the system volume and mounts it. If the letter S is already assigned to a different volume on the computer, then choose one that is available (ex: mountvol z: /s).
3. On the computer you wish to convert, double-click the disk2vhd utility to start the graphical user interface.
4. Select the checkboxes next to the **C:\\** and the **S:\\** volumes, and clear the **Use Volume Shadow Copy checkbox**. Volume shadow copy will not work if the EFI system partition is selected.
- **Important**: You must include the EFI system partition in order to create a bootable VHD. The Windows RE tools partition (shown below) is not required, but it can also be converted if desired.
+ > [!IMPORTANT]
+ > You must include the EFI system partition in order to create a bootable VHD. The Windows RE tools partition (shown below) is not required, but it can also be converted if desired.
5. Specify a location to save the resulting VHD or VHDX file (F:\VHD\PC1.vhdx in the following example) and click **Create**. See the following example:
- >Disk2vhd can save VHDs to local hard drives, even if they are the same as the volumes being converted. Performance is better however when the VHD is saved on a disk different than those being converted, such as a flash drive.
+ Disk2vhd can save VHDs to local hard drives, even if they are the same as the volumes being converted. Performance is better however when the VHD is saved on a disk different than those being converted, such as a flash drive.
6. When the Disk2vhd utility has completed converting the source computer to a VHD, copy the VHDX file (PC1.vhdx) to your Hyper-V host in the C:\VHD directory. There should now be four files in this directory:
-
+ ```console
C:\vhd>dir /B
2012R2-poc-1.vhd
2012R2-poc-2.vhd
w10-enterprise.iso
PC1.VHDX
-
+ ```
#### Prepare a generation 1 VM from a GPT disk
1. Download the [Disk2vhd utility](/sysinternals/downloads/disk2vhd), extract the .zip file and copy **disk2vhd.exe** to a flash drive or other location that is accessible from the computer you wish to convert.
- >You might experience timeouts if you attempt to run Disk2vhd from a network share, or specify a network share for the destination. To avoid timeouts, use local, portable media such as a USB drive.
+ You might experience timeouts if you attempt to run Disk2vhd from a network share, or specify a network share for the destination. To avoid timeouts, use local, portable media such as a USB drive.
2. On the computer you wish to convert, double-click the disk2vhd utility to start the graphical user interface.
-3. Select the checkbox next to the **C:\\** volume and clear the checkbox next to **Use Vhdx**. Note: the system volume is not copied in this scenario, it will be added later.
+3. Select the checkbox next to the **C:\\** volume and clear the checkbox next to **Use Vhdx**.
+
+ > [!NOTE]
+ > The system volume is not copied in this scenario, it will be added later.
+
4. Specify a location to save the resulting VHD file (F:\VHD\w7.vhd in the following example) and click **Create**. See the following example:
- >Disk2vhd can save VHDs to local hard drives, even if they are the same as the volumes being converted. Performance is better however when the VHD is saved on a disk different than those being converted, such as a flash drive.
+ Disk2vhd can save VHDs to local hard drives, even if they are the same as the volumes being converted. Performance is better however when the VHD is saved on a disk different than those being converted, such as a flash drive.
5. When the Disk2vhd utility has completed converting the source computer to a VHD, copy the VHD file (w7.vhd) to your Hyper-V host in the C:\VHD directory. There should now be four files in this directory:
-
+ ```cmd
C:\vhd>dir /B
2012R2-poc-1.vhd
2012R2-poc-2.vhd
w10-enterprise.iso
w7.VHD
-
+ ```
- >In its current state, the w7.VHD file is not bootable. The VHD will be used to create a bootable VM later in the [Configure Hyper-V](#configure-hyper-v) section.
+ In its current state, the w7.VHD file is not bootable. The VHD will be used to create a bootable VM later in the [Configure Hyper-V](#configure-hyper-v) section.
### Resize VHD
-
Enhanced session mode
-**Important**: Before proceeding, verify that you can take advantage of [enhanced session mode](/windows-server/virtualization/hyper-v/learn-more/Use-local-resources-on-Hyper-V-virtual-machine-with-VMConnect) when completing instructions in this guide. Enhanced session mode enables you to copy and paste the commands from the Hyper-V host to VMs, between VMs, and between RDP sessions. After copying some text, you can paste into a Windows PowerShell window by simply right-clicking. Before right-clicking, do not left click other locations as this can empty the clipboard. You can also copy and paste files directly from one computer to another by right-clicking and selecting copy on one computer, then right-clicking and selecting paste on another computer.
+> [!IMPORTANT]
+> Before proceeding, verify that you can take advantage of [enhanced session mode](/windows-server/virtualization/hyper-v/learn-more/Use-local-resources-on-Hyper-V-virtual-machine-with-VMConnect) when completing instructions in this guide. Enhanced session mode enables you to copy and paste the commands from the Hyper-V host to VMs, between VMs, and between RDP sessions. After copying some text, you can paste into a Windows PowerShell window by simply right-clicking. Before right-clicking, do not left click other locations as this can empty the clipboard. You can also copy and paste files directly from one computer to another by right-clicking and selecting copy on one computer, then right-clicking and selecting paste on another computer.
To ensure that enhanced session mode is enabled on the Hyper-V host, type the following command at an elevated Windows PowerShell prompt on the Hyper-V host:
-Set-VMhost -EnableEnhancedSessionMode $TRUE
+```powershell
+Set-VMhost -EnableEnhancedSessionMode $TRUE
+```
->If enhanced session mode was not previously enabled, close any existing virtual machine connections and re-open them to enable access to enhanced session mode. As mentioned previously: instructions to "type" commands provided in this guide can be typed, but the preferred method is to copy and paste these commands. Most of the commands to this point in the guide have been brief, but many commands in sections below are longer and more complex.
+If enhanced session mode was not previously enabled, close any existing virtual machine connections and re-open them to enable access to enhanced session mode. As mentioned previously: instructions to "type" commands provided in this guide can be typed, but the preferred method is to copy and paste these commands. Most of the commands to this point in the guide have been brief, but many commands in sections below are longer and more complex.
@@ -541,58 +470,66 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
1. To add available space for the partition, type the following commands at an elevated Windows PowerShell prompt on the Hyper-V host:
-
+ ```powershell
Resize-VHD -Path c:\VHD\2012R2-poc-2.vhd -SizeBytes 100GB
$x = (Mount-VHD -Path c:\VHD\2012R2-poc-2.vhd -passthru | Get-Disk | Get-Partition | Get-Volume).DriveLetter
Resize-Partition -DriveLetter $x -Size (Get-PartitionSupportedSize -DriveLetter $x).SizeMax
-
+ ```
2. Verify that the mounted VHD drive is resized to 100 GB, and then dismount the drive:
-
+ ```powershell
Get-Volume -DriveLetter $x
- Dismount-VHD -Path c:\VHD\2012R2-poc-2.vhd
+ Dismount-VHD -Path c:\VHD\2012R2-poc-2.vhd
+ ```
### Configure Hyper-V
1. Open an elevated Windows PowerShell window and type the following command to create two virtual switches named "poc-internal" and "poc-external":
- >If the Hyper-V host already has an external virtual switch bound to a physical NIC, do not attempt to add a second external virtual switch. Attempting to add a second external switch will result in an error indicating that the NIC is **already bound to the Microsoft Virtual Switch protocol.** In this case, choose one of the following options:
- A) Remove the existing external virtual switch, then add the poc-external switch
- B) Rename the existing external switch to "poc-external"
- C) Replace each instance of "poc-external" used in this guide with the name of your existing external virtual switch
+ If the Hyper-V host already has an external virtual switch bound to a physical NIC, do not attempt to add a second external virtual switch. Attempting to add a second external switch will result in an error indicating that the NIC is **already bound to the Microsoft Virtual Switch protocol.** In this case, choose one of the following options:
+
+ **A**: Remove the existing external virtual switch, then add the poc-external switch
+
+ **B**: Rename the existing external switch to "poc-external"
+
+ **C**: Replace each instance of "poc-external" used in this guide with the name of your existing external virtual switch
+
If you choose B) or C), then do not run the second command below.
-
+ ```powershell
New-VMSwitch -Name poc-internal -SwitchType Internal -Notes "PoC Network"
New-VMSwitch -Name poc-external -NetAdapterName (Get-NetAdapter |?{$_.Status -eq "Up" -and !$_.Virtual}).Name -Notes "PoC External"
-
+ ```
- **Note**: The second command above will temporarily interrupt network connectivity on the Hyper-V host.
+ > [!NOTE]
+ > The second command above will temporarily interrupt network connectivity on the Hyper-V host.
- >Since an external virtual switch is associated to a physical network adapter on the Hyper-V host, this adapter must be specified when adding the virtual switch. The previous commands automate this by filtering for active non-virtual ethernet adapters using the Get-NetAdapter cmdlet ($_.Status -eq "Up" -and !$_.Virtual). If your Hyper-V host is dual-homed with multiple active ethernet adapters, this automation will not work, and the second command above will fail. In this case, you must edit the command used to add the "poc-external" virtual switch by inserting the appropriate NetAdapterName. The NetAdapterName value corresponds to the name of the network interface you wish to use. For example, if the network interface you use on the Hyper-V host to connect to the Internet is named "Ethernet 2" then type the following command to create an external virtual switch: New-VMSwitch -Name poc-external -NetAdapterName "Ethernet 2" -Notes "PoC External"
+ Since an external virtual switch is associated to a physical network adapter on the Hyper-V host, this adapter must be specified when adding the virtual switch. The previous commands automate this by filtering for active non-virtual ethernet adapters using the Get-NetAdapter cmdlet ($_.Status -eq "Up" -and !$_.Virtual). If your Hyper-V host is dual-homed with multiple active ethernet adapters, this automation will not work, and the second command above will fail. In this case, you must edit the command used to add the "poc-external" virtual switch by inserting the appropriate NetAdapterName. The NetAdapterName value corresponds to the name of the network interface you wish to use. For example, if the network interface you use on the Hyper-V host to connect to the Internet is named "Ethernet 2" then type the following command to create an external virtual switch: New-VMSwitch -Name poc-external -NetAdapterName "Ethernet 2" -Notes "PoC External"
2. At the elevated Windows PowerShell prompt, type the following command to determine the megabytes of RAM that are currently available on the Hyper-V host:
-
+ ```powershell
(Get-VMHostNumaNode).MemoryAvailable
-
+ ```
This command will display the megabytes of RAM available for VMs. On a Hyper-V host computer with 16 GB of physical RAM installed, 10,000 MB of RAM or greater should be available if the computer is not also running other applications. On a computer with 8 GB of physical RAM installed, at least 4000 MB should be available. If the computer has less RAM available than this, try closing applications to free up more memory.
3. Determine the available memory for VMs by dividing the available RAM by 4. For example:
-
+ ```powershell
(Get-VMHostNumaNode).MemoryAvailable/4
2775.5
-
+ ```
In this example, VMs can use a maximum of 2700 MB of RAM each, to run four VMs simultaneously.
4. At the elevated Windows PowerShell prompt, type the following command to create two new VMs. Other VMs will be added later.
- >**Important**: Replace the value of 2700MB for $maxRAM in the first command below with the RAM value that you calculated in the previous step.
-
+ > [!IMPORTANT]
+ > Replace the value of 2700MB for $maxRAM in the first command below with the RAM value that you calculated in the previous step.
+
+ ```powershell
$maxRAM = 2700MB
New-VM -Name "DC1" -VHDPath c:\vhd\2012R2-poc-1.vhd -SwitchName poc-internal
Set-VMMemory -VMName "DC1" -DynamicMemoryEnabled $true -MinimumBytes 512MB -MaximumBytes $maxRAM -Buffer 20
@@ -601,35 +538,37 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
Add-VMNetworkAdapter -VMName "SRV1" -SwitchName "poc-external"
Set-VMMemory -VMName "SRV1" -DynamicMemoryEnabled $true -MinimumBytes 512MB -MaximumBytes $maxRAM -Buffer 80
Enable-VMIntegrationService -Name "Guest Service Interface" -VMName SRV1
-
+ ```
- **Note**: The RAM values assigned to VMs in this step are not permanent, and can be easily increased or decreased later if needed to address performance issues.
+ > [!NOTE]
+ > The RAM values assigned to VMs in this step are not permanent, and can be easily increased or decreased later if needed to address performance issues.
5. Using the same elevated Windows PowerShell prompt that was used in the previous step, type one of the following sets of commands, depending on the type of VM that was prepared in the [Determine VM generation](#determine-vm-generation) section, either generation 1, generation 2, or generation 1 with GPT.
To create a generation 1 VM (using c:\vhd\w7.vhdx):
-
+ ```powershell
New-VM -Name "PC1" -VHDPath c:\vhd\w7.vhdx -SwitchName poc-internal
Set-VMMemory -VMName "PC1" -DynamicMemoryEnabled $true -MinimumBytes 512MB -MaximumBytes $maxRAM -Buffer 20
Enable-VMIntegrationService -Name "Guest Service Interface" -VMName PC1
-
+ ```
To create a generation 2 VM (using c:\vhd\PC1.vhdx):
-
+ ```powershell
New-VM -Name "PC1" -Generation 2 -VHDPath c:\vhd\PC1.vhdx -SwitchName poc-internal
Set-VMMemory -VMName "PC1" -DynamicMemoryEnabled $true -MinimumBytes 512MB -MaximumBytes $maxRAM -Buffer 20
Enable-VMIntegrationService -Name "Guest Service Interface" -VMName PC1
-
+ ```
To create a generation 1 VM from a GPT disk (using c:\vhd\w7.vhd):
- >Note: The following procedure is more complex because it includes steps to convert the OS partition from GPT to MBR format. Steps are included to create a temporary VHD and attach it to the VM, the OS image is saved to this drive, the OS drive is then reformatted to MBR, the OS image restored, and the temporary drive is removed.
+ > [!NOTE]
+ > The following procedure is more complex because it includes steps to convert the OS partition from GPT to MBR format. Steps are included to create a temporary VHD and attach it to the VM, the OS image is saved to this drive, the OS drive is then reformatted to MBR, the OS image restored, and the temporary drive is removed.
First, type the following commands at an elevated Windows PowerShell prompt on the Hyper-V host to create a temporary VHD that will be used to save the OS image. Do not forget to include a pipe (|) at the end of the first five commands:
-
+ ```powershell
New-VHD -Path c:\vhd\d.vhd -SizeBytes 1TB |
Mount-VHD -Passthru |
Get-Disk -Number {$_.DiskNumber} |
@@ -637,11 +576,11 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
New-Partition -UseMaximumSize |
Format-Volume -Confirm:$false -FileSystem NTFS -force
Dismount-VHD -Path c:\vhd\d.vhd
-
+ ```
Next, create the PC1 VM with two attached VHDs, and boot to DVD ($maxram must be defined previously using the same Windows PowerShell prompt):
-
+ ```powershell
New-VM -Name "PC1" -VHDPath c:\vhd\w7.vhd -SwitchName poc-internal
Add-VMHardDiskDrive -VMName PC1 -Path c:\vhd\d.vhd
Set-VMDvdDrive -VMName PC1 -Path c:\vhd\w10-enterprise.iso
@@ -649,7 +588,7 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
Enable-VMIntegrationService -Name "Guest Service Interface" -VMName PC1
Start-VM PC1
vmconnect localhost PC1
-
+ ```
The VM will automatically boot into Windows Setup. In the PC1 window:
@@ -659,13 +598,13 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
4. Click **Command Prompt**.
5. Type the following command to save an image of the OS drive:
-
+ ```console
dism /Capture-Image /ImageFile:D:\c.wim /CaptureDir:C:\ /Name:Drive-C
-
+ ```
6. Wait for the OS image to complete saving, and then type the following commands to convert the C: drive to MBR:
-
+ ```console
diskpart
select disk 0
clean
@@ -677,121 +616,122 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
format fs=ntfs quick label=OS
assign letter=c
exit
-
+ ```
7. Type the following commands to restore the OS image and boot files:
-
+ ```console
dism /Apply-Image /ImageFile:D:\c.wim /Index:1 /ApplyDir:C:\
bcdboot c:\windows
exit
-
+ ```
8. Click **Continue** and verify the VM boots successfully (do not boot from DVD).
9. Click **Ctrl+Alt+Del**, and then in the bottom right corner, click **Shut down**.
10. Type the following commands at an elevated Windows PowerShell prompt on the Hyper-V host to remove the temporary disks and drives from PC1:
-
- Remove-VMHardDiskDrive -VMName PC1 -ControllerType IDE -ControllerNumber 0 -ControllerLocation 1
- Set-VMDvdDrive -VMName PC1 -Path $null
-
+ ```powershell
+ Remove-VMHardDiskDrive -VMName PC1 -ControllerType IDE -ControllerNumber 0 -ControllerLocation 1
+ Set-VMDvdDrive -VMName PC1 -Path $null
+ ```
### Configure VMs
1. At an elevated Windows PowerShell prompt on the Hyper-V host, start the first Windows Server VM and connect to it by typing the following commands:
-
+ ```powershell
Start-VM DC1
vmconnect localhost DC1
-
+ ```
2. Click **Next** to accept the default settings, read the license terms and click **I accept**, provide an administrator password of pass@word1, and click **Finish**.
3. Click **Ctrl+Alt+Del** in the upper left corner of the virtual machine connection window, and then sign in to DC1 using the Administrator account.
4. Right-click **Start**, point to **Shut down or sign out**, and click **Sign out**. The VM connection will reset and a new connection dialog box will appear enabling you to choose a custom display configuration. Select a desktop size, click **Connect** and sign in again with the local Administrator account. Note: Signing in this way ensures that [enhanced session mode](/windows-server/virtualization/hyper-v/learn-more/Use-local-resources-on-Hyper-V-virtual-machine-with-VMConnect) is enabled. It is only necessary to do this the first time you sign in to a new VM.
5. If DC1 is configured as described in this guide, it will currently be assigned an APIPA address, have a randomly generated hostname, and a single network adapter named "Ethernet." Open an elevated Windows PowerShell prompt on DC1 and type or paste the following commands to provide a new hostname and configure a static IP address and gateway:
-
+ ```powershell
Rename-Computer DC1
New-NetIPAddress -InterfaceAlias Ethernet -IPAddress 192.168.0.1 -PrefixLength 24 -DefaultGateway 192.168.0.2
Set-DnsClientServerAddress -InterfaceAlias Ethernet -ServerAddresses 192.168.0.1,192.168.0.2
-
+ ```
- > The default gateway at 192.168.0.2 will be configured later in this guide.
- >
- > Note: A list of available tasks for an app will be populated the first time you run it on the taskbar. Because these tasks aren't available until the App has been run, you will not see the **Run as Administrator** task until you have left-clicked Windows PowerShell for the first time. In this newly created VM, you will need to left-click Windows PowerShell one time, and then you can right-click and choose Run as Administrator to open an elevated Windows PowerShell prompt.
+ The default gateway at 192.168.0.2 will be configured later in this guide.
+
+ > [!NOTE]
+ > A list of available tasks for an app will be populated the first time you run it on the taskbar. Because these tasks aren't available until the App has been run, you will not see the **Run as Administrator** task until you have left-clicked Windows PowerShell for the first time. In this newly created VM, you will need to left-click Windows PowerShell one time, and then you can right-click and choose Run as Administrator to open an elevated Windows PowerShell prompt.
6. Install the Active Directory Domain Services role by typing the following command at an elevated Windows PowerShell prompt:
-
+ ```powershell
Install-WindowsFeature -Name AD-Domain-Services -IncludeAllSubFeature -IncludeManagementTools
-
+ ```
7. Before promoting DC1 to a Domain Controller, you must reboot so that the name change in step 3 above takes effect. To restart the computer, type the following command at an elevated Windows PowerShell prompt:
-
+ ```powershell
Restart-Computer
-
+ ```
8. When DC1 has rebooted, sign in again and open an elevated Windows PowerShell prompt. Now you can promote the server to be a domain controller. The directory services restore mode password must be entered as a secure string. Type the following commands at the elevated Windows PowerShell prompt:
-
+ ```powershell
$pass = "pass@word1" | ConvertTo-SecureString -AsPlainText -Force
Install-ADDSForest -DomainName contoso.com -InstallDns -SafeModeAdministratorPassword $pass -Force
-
+ ```
Ignore any warnings that are displayed. The computer will automatically reboot upon completion.
9. When the reboot has completed, reconnect to DC1, sign in using the CONTOSO\Administrator account, open an elevated Windows PowerShell prompt, and use the following commands to add a reverse lookup zone for the PoC network, add the DHCP Server role, authorize DHCP in Active Directory, and suppress the post-DHCP-install alert:
-
+ ```powershell
Add-DnsServerPrimaryZone -NetworkID "192.168.0.0/24" -ReplicationScope Forest
Add-WindowsFeature -Name DHCP -IncludeManagementTools
netsh dhcp add securitygroups
Restart-Service DHCPServer
Add-DhcpServerInDC dc1.contoso.com 192.168.0.1
Set-ItemProperty -Path registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ServerManager\Roles\12 -Name ConfigurationState -Value 2
-
+ ```
10. Next, add a DHCP scope and set option values:
-
+ ```powershell
Add-DhcpServerv4Scope -Name "PoC Scope" -StartRange 192.168.0.100 -EndRange 192.168.0.199 -SubnetMask 255.255.255.0 -Description "Windows 10 PoC" -State Active
Set-DhcpServerv4OptionValue -ScopeId 192.168.0.0 -DnsDomain contoso.com -Router 192.168.0.2 -DnsServer 192.168.0.1,192.168.0.2 -Force
-
+ ```
- >The -Force option is necessary when adding scope options to skip validation of 192.168.0.2 as a DNS server because we have not configured it yet. The scope should immediately begin issuing leases on the PoC network. The first DHCP lease that will be issued is to vEthernet interface on the Hyper-V host, which is a member of the internal network. You can verify this by using the command: Get-DhcpServerv4Lease -ScopeId 192.168.0.0.
+ The -Force option is necessary when adding scope options to skip validation of 192.168.0.2 as a DNS server because we have not configured it yet. The scope should immediately begin issuing leases on the PoC network. The first DHCP lease that will be issued is to vEthernet interface on the Hyper-V host, which is a member of the internal network. You can verify this by using the command: Get-DhcpServerv4Lease -ScopeId 192.168.0.0.
11. The DNS server role will also be installed on the member server, SRV1, at 192.168.0.2 so that we can forward DNS queries from DC1 to SRV1 to resolve Internet names without having to configure a forwarder outside the PoC network. Since the IP address of SRV1 already exists on DC1's network adapter, it will be automatically added during the DCPROMO process. To verify this server-level DNS forwarder on DC1, type the following command at an elevated Windows PowerShell prompt on DC1:
-
+ ```powershell
Get-DnsServerForwarder
-
+ ```
The following output should be displayed:
-
+ ```powershell
UseRootHint : True
Timeout(s) : 3
EnableReordering : True
IPAddress : 192.168.0.2
ReorderedIPAddress : 192.168.0.2
-
+ ```
If this output is not displayed, you can use the following command to add SRV1 as a forwarder:
-
+ ```powershell
Add-DnsServerForwarder -IPAddress 192.168.0.2
-
+ ```
**Configure service and user accounts**
Windows 10 deployment with MDT and Microsoft Endpoint Manager requires specific accounts to perform some actions. Service accounts will be created to use for these tasks. A user account is also added in the contoso.com domain that can be used for testing purposes. In the test lab environment, passwords are set to never expire.
- >To keep this test lab relatively simple, we will not create a custom OU structure and set permissions. Required permissions are enabled by adding accounts to the Domain Admins group. To configure these settings in a production environment, see [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
+ To keep this test lab relatively simple, we will not create a custom OU structure and set permissions. Required permissions are enabled by adding accounts to the Domain Admins group. To configure these settings in a production environment, see [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
On DC1, open an elevated Windows PowerShell prompt and type the following commands:
-
+ ```powershell
New-ADUser -Name User1 -UserPrincipalName user1 -Description "User account" -AccountPassword (ConvertTo-SecureString "pass@word1" -AsPlainText -Force) -ChangePasswordAtLogon $false -Enabled $true
New-ADUser -Name MDT_BA -UserPrincipalName MDT_BA -Description "MDT Build Account" -AccountPassword (ConvertTo-SecureString "pass@word1" -AsPlainText -Force) -ChangePasswordAtLogon $false -Enabled $true
New-ADUser -Name CM_JD -UserPrincipalName CM_JD -Description "Configuration Manager Join Domain Account" -AccountPassword (ConvertTo-SecureString "pass@word1" -AsPlainText -Force) -ChangePasswordAtLogon $false -Enabled $true
@@ -802,7 +742,7 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
Set-ADUser -Identity MDT_BA -PasswordNeverExpires $true
Set-ADUser -Identity CM_JD -PasswordNeverExpires $true
Set-ADUser -Identity CM_NAA -PasswordNeverExpires $true
-
+ ```
12. Minimize the DC1 VM window but **do not stop** the VM.
@@ -810,20 +750,20 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
13. If the PC1 VM is not started yet, using an elevated Windows PowerShell prompt on the Hyper-V host, start the client VM (PC1), and connect to it:
-
+ ```powershell
Start-VM PC1
vmconnect localhost PC1
-
+ ```
14. Sign in to PC1 using an account that has local administrator rights.
- >PC1 will be disconnected from its current domain, so you cannot use a domain account to sign on unless these credentials are cached and the use of cached credentials is permitted by Group Policy. If cached credentials are available and permitted, you can use these credentials to sign in. Otherwise, use an existing local administrator account.
+ PC1 will be disconnected from its current domain, so you cannot use a domain account to sign on unless these credentials are cached and the use of cached credentials is permitted by Group Policy. If cached credentials are available and permitted, you can use these credentials to sign in. Otherwise, use an existing local administrator account.
15. After signing in, the operating system detects that it is running in a new environment. New drivers will be automatically installed, including the network adapter driver. The network adapter driver must be updated before you can proceed, so that you will be able to join the contoso.com domain. Depending on the resources allocated to PC1, installing the network adapter driver might take a few minutes. You can monitor device driver installation by clicking **Show hidden icons** in the notification area.
- >If the client was configured with a static address, you must change this to a dynamic one so that it can obtain a DHCP lease.
+ If the client was configured with a static address, you must change this to a dynamic one so that it can obtain a DHCP lease.
16. When the new network adapter driver has completed installation, you will receive an alert to set a network location for the contoso.com network. Select **Work network** and then click **Close**. When you receive an alert that a restart is required, click **Restart Later**.
@@ -831,7 +771,7 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
To open Windows PowerShell on Windows 7, click **Start**, and search for "**power**." Right-click **Windows PowerShell** and then click **Pin to Taskbar** so that it is simpler to use Windows PowerShell during this lab. Click **Windows PowerShell** on the taskbar, and then type **ipconfig** at the prompt to see the client's current IP address. Also type **ping dc1.contoso.com** and **nltest /dsgetdc:contoso.com** to verify that it can reach the domain controller. See the following examples of a successful network connection:
- ```
+ ```console
ipconfig
Windows IP Configuration
@@ -862,99 +802,108 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
Flags: PDC GC DS LDAP KDC TIMESERV WRITABLE DNS_FOREST CLOSE_SITE FULL_SECRET WS 0xC000
```
- >If PC1 is running Windows 7, enhanced session mode might not be available, which means that you cannot copy and paste commands from the Hyper-V host to a Windows PowerShell prompt on PC1. However, it is possible to use integration services to copy a file from the Hyper-V host to a VM. The next procedure demonstrates this. If the Copy-VMFile command fails, then type the commands below at an elevated Windows PowerShell prompt on PC1 instead of saving them to a script to run remotely. If PC1 is running Windows 8 or a later operating system, you can use enhanced session mode to copy and paste these commands instead of typing them.
+ > [!NOTE]
+ > If PC1 is running Windows 7, enhanced session mode might not be available, which means that you cannot copy and paste commands from the Hyper-V host to a Windows PowerShell prompt on PC1. However, it is possible to use integration services to copy a file from the Hyper-V host to a VM. The next procedure demonstrates this. If the Copy-VMFile command fails, then type the commands below at an elevated Windows PowerShell prompt on PC1 instead of saving them to a script to run remotely. If PC1 is running Windows 8 or a later operating system, you can use enhanced session mode to copy and paste these commands instead of typing them.
18. Minimize the PC1 window and switch to the Hyper-V host computer. Open an elevated Windows PowerShell ISE window on the Hyper-V host (right-click Windows PowerShell and then click **Run ISE as Administrator**) and type the following commands in the (upper) script editor pane:
-
+ ```powershell
(Get-WmiObject Win32_ComputerSystem).UnjoinDomainOrWorkgroup($null,$null,0)
$pass = "pass@word1" | ConvertTo-SecureString -AsPlainText -Force
$user = "contoso\administrator"
$cred = New-Object System.Management.Automation.PSCredential($user,$pass)
Add-Computer -DomainName contoso.com -Credential $cred
Restart-Computer
-
+ ```
- >If you do not see the script pane, click **View** and verify **Show Script Pane Top** is enabled. Click **File** and then click **New**.
+ If you do not see the script pane, click **View** and verify **Show Script Pane Top** is enabled. Click **File** and then click **New**.
See the following example:
- 
+ :::image type="content" alt-text="ISE 1." source="images/ISE.png" lightbox="images/ISE.png":::
19. Click **File**, click **Save As**, and save the commands as **c:\VHD\pc1.ps1** on the Hyper-V host.
+
20. In the (lower) terminal input window, type the following commands to enable Guest Service Interface on PC1 and then use this service to copy the script to PC1:
-
+ ```powershell
Enable-VMIntegrationService -VMName PC1 -Name "Guest Service Interface"
Copy-VMFile "PC1" -SourcePath "C:\VHD\pc1.ps1" -DestinationPath "C:\pc1.ps1" -CreateFullPath -FileSource Host
-
+ ```
- >In order for this command to work properly, PC1 must be running the vmicguestinterface (Hyper-V Guest Service Interface) service. If this service is not enabled in this step, then the copy-VMFile command will fail. In this case, you can try updating integration services on the VM by mounting the Hyper-V Integration Services Setup (vmguest.iso), which is located in C:\Windows\System32 on Windows Server 2012 and 2012 R2 operating systems that are running the Hyper-V role service.
+ > [!NOTE]
+ > In order for this command to work properly, PC1 must be running the vmicguestinterface (Hyper-V Guest Service Interface) service. If this service is not enabled in this step, then the copy-VMFile command will fail. In this case, you can try updating integration services on the VM by mounting the Hyper-V Integration Services Setup (vmguest.iso), which is located in C:\Windows\System32 on Windows Server 2012 and 2012 R2 operating systems that are running the Hyper-V role service.
If the copy-vmfile command does not work and you cannot properly enable or upgrade integration services on PC1, then create the file c:\pc1.ps1 on the VM by typing the commands into this file manually. The copy-vmfile command is only used in this procedure as a demonstration of automation methods that can be used in a Hyper-V environment when enhanced session mode is not available. After typing the script file manually, be sure to save the file as a Windows PowerShell script file with the .ps1 extension and not as a text (.txt) file.
21. On PC1, type the following commands at an elevated Windows PowerShell prompt:
-
+ ```powershell
Get-Content c:\pc1.ps1 | powershell.exe -noprofile -
-
+ ```
- >The commands in this script might take a few moments to complete. If an error is displayed, check that you typed the command correctly, paying close attention to spaces. PC1 is removed from its domain in this step while not connected to the corporate network so as to ensure the computer object in the corporate domain is unaffected. PC1 is also not renamed to "PC1" in system properties so that it maintains some of its mirrored identity. However, if desired you can also rename the computer.
+ The commands in this script might take a few moments to complete. If an error is displayed, check that you typed the command correctly, paying close attention to spaces. PC1 is removed from its domain in this step while not connected to the corporate network so as to ensure the computer object in the corporate domain is unaffected. PC1 is also not renamed to "PC1" in system properties so that it maintains some of its mirrored identity. However, if desired you can also rename the computer.
22. Upon completion of the script, PC1 will automatically restart. When it has restarted, sign in to the contoso.com domain using the **Switch User** option, with the **user1** account you created in step 11 of this section.
- >**Important**: The settings that will be used later to migrate user data specifically select only accounts that belong to the CONTOSO domain. However, this can be changed to migrate all user accounts, or only other specified accounts. If you wish to test migration of user data and settings with accounts other than those in the CONTOSO domain, you must specify these accounts or domains when you configure the value of **ScanStateArgs** in the MDT test lab guide. This value is specifically called out when you get to that step. If you wish to only migrate CONTOSO accounts, then you can log in with the user1 account or the administrator account at this time and modify some of the files and settings for later use in migration testing.
+
+ > [!IMPORTANT]
+ > The settings that will be used later to migrate user data specifically select only accounts that belong to the CONTOSO domain. However, this can be changed to migrate all user accounts, or only other specified accounts. If you wish to test migration of user data and settings with accounts other than those in the CONTOSO domain, you must specify these accounts or domains when you configure the value of **ScanStateArgs** in the MDT test lab guide. This value is specifically called out when you get to that step. If you wish to only migrate CONTOSO accounts, then you can log in with the user1 account or the administrator account at this time and modify some of the files and settings for later use in migration testing.
+
23. Minimize the PC1 window but do not turn it off while the second Windows Server 2012 R2 VM (SRV1) is configured. This verifies that the Hyper-V host has enough resources to run all VMs simultaneously. Next, SRV1 will be started, joined to the contoso.com domain, and configured with RRAS and DNS services.
+
24. On the Hyper-V host computer, at an elevated Windows PowerShell prompt, type the following commands:
-
+ ```powershell
Start-VM SRV1
vmconnect localhost SRV1
-
+ ```
25. Accept the default settings, read license terms and accept them, provide an administrator password of pass@word1, and click **Finish**. When you are prompted about finding PCs, devices, and content on the network, click **Yes**.
+
26. Sign in to SRV1 using the local administrator account. In the same way that was done on DC1, sign out of SRV1 and then sign in again to enable enhanced session mode. This will enable you to copy and paste Windows PowerShell commands from the Hyper-V host to the VM.
+
27. Open an elevated Windows PowerShell prompt on SRV1 and type the following commands:
-
+ ```powershell
Rename-Computer SRV1
New-NetIPAddress -InterfaceAlias Ethernet -IPAddress 192.168.0.2 -PrefixLength 24
Set-DnsClientServerAddress -InterfaceAlias Ethernet -ServerAddresses 192.168.0.1,192.168.0.2
Restart-Computer
-
+ ```
- >[!IMPORTANT]
- >Verify that you are configuring the correct interface in this step. The commands in this step assume that the poc-internal interface on SRV1 is named "Ethernet." If you are unsure how to check the interface, see step #30 below for instructions and tips on how to verify and modify the interface name.
+ > [!IMPORTANT]
+ > Verify that you are configuring the correct interface in this step. The commands in this step assume that the poc-internal interface on SRV1 is named "Ethernet." If you are unsure how to check the interface, see step #30 below for instructions and tips on how to verify and modify the interface name.
28. Wait for the computer to restart, sign in again, then type the following commands at an elevated Windows PowerShell prompt:
-
+ ```powershell
$pass = "pass@word1" | ConvertTo-SecureString -AsPlainText -Force
$user = "contoso\administrator"
$cred = New-Object System.Management.Automation.PSCredential($user,$pass)
Add-Computer -DomainName contoso.com -Credential $cred
Restart-Computer
-
+ ```
29. Sign in to the contoso.com domain on SRV1 using the domain administrator account (enter contoso\administrator as the user), open an elevated Windows PowerShell prompt, and type the following commands:
-
+ ```powershell
Install-WindowsFeature -Name DNS -IncludeManagementTools
Install-WindowsFeature -Name WDS -IncludeManagementTools
Install-WindowsFeature -Name Routing -IncludeManagementTools
-
+ ```
30. Before configuring the routing service that was just installed, verify that network interfaces were added to SRV1 in the right order, resulting in an interface alias of "Ethernet" for the private interface, and an interface alias of "Ethernet 2" for the public interface. Also verify that the external interface has a valid external DHCP IP address lease.
To view a list of interfaces, associated interface aliases, and IP addresses on SRV1, type the following Windows PowerShell command. Example output of the command is also shown below:
-
+ ```powershell
Get-NetAdapter | ? status -eq ‘up’ | Get-NetIPAddress -AddressFamily IPv4 | ft IPAddress, InterfaceAlias
IPAddress InterfaceAlias
--------- --------------
10.137.130.118 Ethernet 2
192.168.0.2 Ethernet
-
+ ```
In this example, the poc-internal network interface at 192.168.0.2 is associated with the "Ethernet" interface and the Internet-facing poc-external interface is associated with the "Ethernet 2" interface. If your interfaces are different, you must adjust the commands provided in the next step appropriately to configure routing services. Also note that if the "Ethernet 2" interface has an IP address in the 192.168.0.100-105 range then it likely is getting a DHCP lease from DC1 instead of your corporate network. If this is the case, you can try removing and re-adding the second network interface from the SRV1 VM through its Hyper-V settings.
@@ -964,37 +913,38 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
31. To configure SRV1 with routing capability for the PoC network, type or paste the following commands at an elevated Windows PowerShell prompt on SRV1:
-
+ ```powershell
Install-RemoteAccess -VpnType Vpn
cmd /c netsh routing ip nat install
cmd /c netsh routing ip nat add interface name="Ethernet 2" mode=FULL
cmd /c netsh routing ip nat add interface name="Ethernet" mode=PRIVATE
cmd /c netsh routing ip nat add interface name="Internal" mode=PRIVATE
-
+ ```
32. The DNS service on SRV1 also needs to resolve hosts in the `contoso.com` domain. This can be accomplished with a conditional forwarder. Open an elevated Windows PowerShell prompt on SRV1 and type the following command:
-
+ ```powershell
Add-DnsServerConditionalForwarderZone -Name contoso.com -MasterServers 192.168.0.1
-
+ ```
33. In most cases, this completes configuration of the PoC network. However, if your corporate network has a firewall that filters queries from local DNS servers, you will also need to configure a server-level DNS forwarder on SRV1 to resolve Internet names. To test whether or not DNS is working without this forwarder, try to reach a name on the Internet from DC1 or PC1, which are only using DNS services on the PoC network. You can test DNS with the ping command, for example:
-
+ ```powershell
ping www.microsoft.com
-
+ ```
If you see "Ping request could not find host `www.microsoft.com`" on PC1 and DC1, but not on SRV1, then you will need to configure a server-level DNS forwarder on SRV1. To do this, open an elevated Windows PowerShell prompt on SRV1 and type the following command.
- **Note**: This command also assumes that "Ethernet 2" is the external-facing network adapter on SRV1. If the external adapter has a different name, replace "Ethernet 2" in the command below with that name:
+ > [!NOTE]
+ > This command also assumes that "Ethernet 2" is the external-facing network adapter on SRV1. If the external adapter has a different name, replace "Ethernet 2" in the command below with that name:
-
+ ```powershell
Add-DnsServerForwarder -IPAddress (Get-DnsClientServerAddress -InterfaceAlias "Ethernet 2").ServerAddresses
-
+ ```
34. If DNS and routing are both working correctly, you will see the following on DC1 and PC1 (the IP address might be different, but that is OK):
-
+ ```powershell
PS C:\> ping www.microsoft.com
Pinging e2847.dspb.akamaiedge.net [23.222.146.170] with 32 bytes of data:
@@ -1007,15 +957,15 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
Packets: Sent = 4, Received = 4, Lost = 0 (0% loss),
Approximate round trip times in milli-seconds:
Minimum = 1ms, Maximum = 3ms, Average = 2ms
-
+ ```
35. Verify that all three VMs can reach each other, and the Internet. See [Appendix A: Verify the configuration](#appendix-a-verify-the-configuration) for more information.
36. Lastly, because the client computer has different hardware after copying it to a VM, its Windows activation will be invalidated and you might receive a message that you must activate Windows in 3 days. To extend this period to 30 days, type the following commands at an elevated Windows PowerShell prompt on PC1:
-
+ ```powershell
runas /noprofile /env /user:administrator@contoso.com "cmd /c slmgr -rearm"
Restart-Computer
-
+ ```
This completes configuration of the starting PoC environment. Additional services and tools are installed in subsequent guides.
@@ -1025,7 +975,7 @@ Use the following procedures to verify that the PoC environment is configured pr
1. On DC1, open an elevated Windows PowerShell prompt and type the following commands:
-
+ ```powershell
Get-Service NTDS,DNS,DHCP
DCDiag -a
Get-DnsServerResourceRecord -ZoneName contoso.com -RRType A
@@ -1034,72 +984,79 @@ Use the following procedures to verify that the PoC environment is configured pr
Get-DhcpServerInDC
Get-DhcpServerv4Statistics
ipconfig /all
-
+ ```
- **Get-Service** displays a status of "Running" for all three services.
- **DCDiag** displays "passed test" for all tests.
- **Get-DnsServerResourceRecord** displays the correct DNS address records for DC1, SRV1, and the computername of PC1. Additional address records for the zone apex (@), DomainDnsZones, and ForestDnsZones will also be registered.
- **Get-DnsServerForwarder** displays a single forwarder of 192.168.0.2.
- **Resolve-DnsName** displays public IP address results for `www.microsoft.com`.
- **Get-DhcpServerInDC** displays 192.168.0.1, `dc1.contoso.com`.
- **Get-DhcpServerv4Statistics** displays 1 scope with 2 addresses in use (these belong to PC1 and the Hyper-V host).
+ **Get-Service** displays a status of "Running" for all three services.
+
+ **DCDiag** displays "passed test" for all tests.
+
+ **Get-DnsServerResourceRecord** displays the correct DNS address records for DC1, SRV1, and the computername of PC1. Additional address records for the zone apex (@), DomainDnsZones, and ForestDnsZones will also be registered.
+
+ **Get-DnsServerForwarder** displays a single forwarder of 192.168.0.2.
+
+ **Resolve-DnsName** displays public IP address results for `www.microsoft.com`.
+
+ **Get-DhcpServerInDC** displays 192.168.0.1, `dc1.contoso.com`.
+
+ **Get-DhcpServerv4Statistics** displays 1 scope with 2 addresses in use (these belong to PC1 and the Hyper-V host).
+
**ipconfig** displays a primary DNS suffix and suffix search list of `contoso.com`, IP address of 192.168.0.1, subnet mask of 255.255.255.0, default gateway of 192.168.0.2, and DNS server addresses of 192.168.0.1 and 192.168.0.2.
2. On SRV1, open an elevated Windows PowerShell prompt and type the following commands:
-
+ ```powershell
Get-Service DNS,RemoteAccess
Get-DnsServerForwarder
Resolve-DnsName -Server dc1.contoso.com -Name www.microsoft.com
ipconfig /all
netsh int ipv4 show address
-
+ ```
+
+ **Get-Service** displays a status of "Running" for both services.
+
+ **Get-DnsServerForwarder** either displays no forwarders, or displays a list of forwarders you are required to use so that SRV1 can resolve Internet names.
+
+ **Resolve-DnsName** displays public IP address results for `www.microsoft.com`.
+
+ **ipconfig** displays a primary DNS suffix of `contoso.com`. The suffix search list contains `contoso.com` and your corporate domain. Two ethernet adapters are shown: Ethernet adapter "Ethernet" has an IP addresses of 192.168.0.2, subnet mask of 255.255.255.0, no default gateway, and DNS server addresses of 192.168.0.1 and 192.168.0.2. Ethernet adapter "Ethernet 2" has an IP address, subnet mask, and default gateway configured by DHCP on your corporate network.
- **Get-Service** displays a status of "Running" for both services.
- **Get-DnsServerForwarder** either displays no forwarders, or displays a list of forwarders you are required to use so that SRV1 can resolve Internet names.
- **Resolve-DnsName** displays public IP address results for `www.microsoft.com`.
- **ipconfig** displays a primary DNS suffix of `contoso.com`. The suffix search list contains `contoso.com` and your corporate domain. Two ethernet adapters are shown: Ethernet adapter "Ethernet" has an IP addresses of 192.168.0.2, subnet mask of 255.255.255.0, no default gateway, and DNS server addresses of 192.168.0.1 and 192.168.0.2. Ethernet adapter "Ethernet 2" has an IP address, subnet mask, and default gateway configured by DHCP on your corporate network.
**netsh** displays three interfaces on the computer: interface "Ethernet 2" with DHCP enabled = Yes and IP address assigned by your corporate network, interface "Ethernet" with DHCP enabled = No and IP address of 192.168.0.2, and interface "Loopback Pseudo-Interface 1" with IP address of 127.0.0.1.
3. On PC1, open an elevated Windows PowerShell prompt and type the following commands:
-
+ ```powershell
whoami
hostname
nslookup www.microsoft.com
ping -n 1 dc1.contoso.com
tracert www.microsoft.com
-
+ ```
+
+ **whoami** displays the current user context, for example in an elevated Windows PowerShell prompt, contoso\administrator is displayed.
+
+ **hostname** displays the name of the local computer, for example W7PC-001.
+
+ **nslookup** displays the DNS server used for the query, and the results of the query. For example, server `dc1.contoso.com`, address 192.168.0.1, Name `e2847.dspb.akamaiedge.net`.
+
+ **ping** displays if the source can resolve the target name, and whether or not the target responds to ICMP. If it cannot be resolved, "..could not find host" will be displayed and if the target is found and also responds to ICMP, you will see "Reply from" and the IP address of the target.
- **whoami** displays the current user context, for example in an elevated Windows PowerShell prompt, contoso\administrator is displayed.
- **hostname** displays the name of the local computer, for example W7PC-001.
- **nslookup** displays the DNS server used for the query, and the results of the query. For example, server `dc1.contoso.com`, address 192.168.0.1, Name `e2847.dspb.akamaiedge.net`.
- **ping** displays if the source can resolve the target name, and whether or not the target responds to ICMP. If it cannot be resolved, "..could not find host" will be displayed and if the target is found and also responds to ICMP, you will see "Reply from" and the IP address of the target.
**tracert** displays the path to reach the destination, for example `srv1.contoso.com` [192.168.0.2] followed by a list of hosts and IP addresses corresponding to subsequent routing nodes between the source and the destination.
## Appendix B: Terminology used in this guide
-
-
-
-
-
-| Term
- | Definition
- |
| GPT | GUID partition table (GPT) is an updated hard-disk formatting scheme that enables the use of newer hardware. GPT is one of the partition formats that can be chosen when first initializing a hard drive, prior to creating and formatting partitions.
- |
| Hyper-V | Hyper-V is a server role introduced with Windows Server 2008 that lets you create a virtualized computing environment. Hyper-V can also be installed as a Windows feature on Windows client operating systems, starting with Windows 8.
- |
| Hyper-V host | The computer where Hyper-V is installed.
- |
| Hyper-V Manager | The user-interface console used to view and configure Hyper-V.
- |
| MBR | Master Boot Record (MBR) is a legacy hard-disk formatting scheme that limits support for newer hardware. MBR is one of the partition formats that can be chosen when first initializing a hard drive, prior to creating and formatting partitions. MBR is in the process of being replaced by the GPT partition format.
- |
| Proof of concept (PoC) | Confirmation that a process or idea works as intended. A PoC is carried out in a test environment to learn about and verify a process.
- |
| Shadow copy | A copy or "snapshot" of a computer at a point in time, created by the Volume Shadow Copy Service (VSS), typically for backup purposes.
- |
| Virtual machine (VM) | A VM is a virtual computer with its own operating system, running on the Hyper-V host.
- |
| Virtual switch | A virtual network connection used to connect VMs to each other and to physical network adapters on the Hyper-V host.
- |
| VM snapshot | A point in time image of a VM that includes its disk, memory and device state. It can be used to return a virtual machine to a former state corresponding to the time the snapshot was taken.
- |
-
-
-
-
-
-
-
-
-
-
-
-Well-Known SID/RID |
-S-1-5-<domain>-13 (Terminal Server User), S-1-5-<domain>-14 (Remote Interactive Logon) |
-
-
-Type |
-User |
-
-
-Default container |
-CN=Users, DC=<domain>, DC= |
-
-
-Default members |
-None |
-
-
-Default member of |
-Domain Guests
-Guests |
-
-
-Protected by ADMINSDHOLDER? |
-No |
-
-
-Safe to move out of default container? |
-Can be moved out, but we do not recommend it. |
-
-
-Safe to delegate management of this group to non-Service admins? |
-No |
-
-
-
+|Attribute|Value|
+|--- |--- |
+|Well-Known SID/RID|`S-1-5--13 (Terminal Server User), S-1-5--14 (Remote Interactive Logon)`|
+|Type|User|
+|Default container|`CN=Users, DC=, DC=`|
+|Default members|None|
+|Default member of|Domain Guests
Guests|
+|Protected by ADMINSDHOLDER?|No|
+|Safe to move out of default container?|Can be moved out, but we do not recommend it.|
+|Safe to delegate management of this group to non-Service admins?|No|
### DefaultAccount
@@ -232,8 +191,8 @@ The SYSTEM account is used by the operating system and by services that run unde
On the other hand, the SYSTEM account does appear on an NTFS file system volume in File Manager in the **Permissions** portion of the **Security** menu. By default, the SYSTEM account is granted Full Control permissions to all files on an NTFS volume. Here the SYSTEM account has the same functional rights and permissions as the Administrator account.
-**Note**
-To grant the account Administrators group file permissions does not implicitly give permission to the SYSTEM account. The SYSTEM account's permissions can be removed from a file, but we do not recommend removing them.
+> [!NOTE]
+> To grant the account Administrators group file permissions does not implicitly give permission to the SYSTEM account. The SYSTEM account's permissions can be removed from a file, but we do not recommend removing them.
### NETWORK SERVICE
The NETWORK SERVICE account is a predefined local account used by the service control manager (SCM). A service that runs in the context of the NETWORK SERVICE account presents the computer's credentials to remote servers. For more information, see [NetworkService Account](/windows/desktop/services/networkservice-account).
@@ -250,8 +209,8 @@ You can use Local Users and Groups to assign rights and permissions on the local
You cannot use Local Users and Groups on a domain controller. However, you can use Local Users and Groups on a domain controller to target remote computers that are not domain controllers on the network.
-**Note**
-You use Active Directory Users and Computers to manage users and groups in Active Directory.
+> [!NOTE]
+> You use Active Directory Users and Computers to manage users and groups in Active Directory.
You can also manage local users by using NET.EXE USER and manage local groups by using NET.EXE LOCALGROUP, or by using a variety of PowerShell cmdlets and other scripting technologies.
@@ -271,8 +230,8 @@ The other approaches that can be used to restrict and protect user accounts with
Each of these approaches is described in the following sections.
-**Note**
-These approaches do not apply if all administrative local accounts are disabled.
+> [!NOTE]
+> These approaches do not apply if all administrative local accounts are disabled.
@@ -290,77 +249,24 @@ For more information about UAC, see [User Account Control](/windows/access-prote
The following table shows the Group Policy and registry settings that are used to enforce local account restrictions for remote access.
-
-
-
-
-
-
-
-
-No. |
-Setting |
-Detailed Description |
-
-
- |
-Policy location |
-Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options |
-
-
-1 |
-Policy name |
-User Account Control: Run all administrators in Admin Approval Mode |
-
-
- |
-Policy setting |
-Enabled |
-
-
-2 |
-Policy location |
-Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options |
-
-
- |
-Policy name |
-User Account Control: Run all administrators in Admin Approval Mode |
-
-
- |
-Policy setting |
-Enabled |
-
-
-3 |
-Registry key |
-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System |
-
-
- |
-Registry value name |
-LocalAccountTokenFilterPolicy |
-
-
- |
-Registry value type |
-DWORD |
-
-
- |
-Registry value data |
-0 |
-
-
-
+|No.|Setting|Detailed Description|
+|--- |--- |--- |
+||Policy location|Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options|
+|1|Policy name|[User Account Control: Run all administrators in Admin Approval Mode](/windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode)|
+||Policy setting|Enabled|
+|2|Policy location|Computer Configuration\Windows Settings\Security Settings\Local Policies\Security Options|
+||Policy name|[User Account Control: Run all administrators in Admin Approval Mode](/windows/device-security/security-policy-settings/user-account-control-run-all-administrators-in-admin-approval-mode)|
+||Policy setting|Enabled|
+|3|Registry key|HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System|
+||Registry value name|LocalAccountTokenFilterPolicy|
+||Registry value type|DWORD|
+||Registry value data|0|
-
->[!NOTE]
->You can also enforce the default for LocalAccountTokenFilterPolicy by using the custom ADMX in Security Templates.
+> [!NOTE]
+> You can also enforce the default for LocalAccountTokenFilterPolicy by using the custom ADMX in Security Templates.
-**To enforce local account restrictions for remote access**
+#### To enforce local account restrictions for remote access
1. Start the **Group Policy Management** Console (GPMC).
@@ -430,63 +336,23 @@ The following table shows the Group Policy and registry settings that are used t
Denying local accounts the ability to perform network logons can help prevent a local account password hash from being reused in a malicious attack. This procedure helps to prevent lateral movement by ensuring that the credentials for local accounts that are stolen from a compromised operating system cannot be used to compromise additional computers that use the same credentials.
-**Note**
-In order to perform this procedure, you must first identify the name of the local, default Administrator account, which might not be the default user name "Administrator", and any other accounts that are members of the local Administrators group.
+> [!NOTE]
+> To perform this procedure, you must first identify the name of the local, default Administrator account, which might not be the default user name "Administrator", and any other accounts that are members of the local Administrators group.
The following table shows the Group Policy settings that are used to deny network logon for all local Administrator accounts.
-
-
-
-
-
-
-
-
-No. |
-Setting |
-Detailed Description |
-
-
- |
-Policy location |
-Computer Configuration\Windows Settings\Security Settings\Local Policies\User Rights Assignment |
-
-
-1 |
-Policy name |
-Deny access to this computer from the network |
-
-
- |
-Policy setting |
-Local account and member of Administrators group
- |
-
-
-2 |
-Policy location |
-Computer Configuration\Windows Settings\Security Settings\Local Policies\User Rights Assignment |
-
-
- |
-Policy name |
-Deny log on through Remote Desktop Services |
-
-
- |
-Policy setting |
-Local account and member of Administrators group
- |
-
-
-
+|No.|Setting|Detailed Description|
+|--- |--- |--- |
+||Policy location|Computer Configuration\Windows Settings\Security Settings\Local Policies\User Rights Assignment|
+|1|Policy name|[Deny access to this computer from the network](/windows/device-security/security-policy-settings/deny-access-to-this-computer-from-the-network)|
+||Policy setting|Local account and member of Administrators group|
+|2|Policy location|Computer Configuration\Windows Settings\Security Settings\Local Policies\User Rights Assignment|
+||Policy name|[Deny log on through Remote Desktop Services](/windows/device-security/security-policy-settings/deny-log-on-through-remote-desktop-services)|
+||Policy setting|Local account and member of Administrators group|
-
-
-**To deny network logon to all local administrator accounts**
+#### To deny network logon to all local administrator accounts
1. Start the **Group Policy Management** Console (GPMC).
@@ -532,8 +398,8 @@ The following table shows the Group Policy settings that are used to deny networ
11. Create links to all other OUs that contain servers.
- **Note**
- You might have to create a separate GPO if the user name of the default Administrator account is different on workstations and servers.
+ > [!NOTE]
+ > You might have to create a separate GPO if the user name of the default Administrator account is different on workstations and servers.
### Create unique passwords for local accounts with administrative rights
@@ -559,4 +425,4 @@ The following resources provide additional information about technologies that a
- [Security Identifiers](security-identifiers.md)
-- [Access Control Overview](access-control.md)
\ No newline at end of file
+- [Access Control Overview](access-control.md)
diff --git a/windows/security/identity-protection/hello-for-business/hello-how-it-works-provisioning.md b/windows/security/identity-protection/hello-for-business/hello-how-it-works-provisioning.md
index c114cd86e5..bf92834f9b 100644
--- a/windows/security/identity-protection/hello-for-business/hello-how-it-works-provisioning.md
+++ b/windows/security/identity-protection/hello-for-business/hello-how-it-works-provisioning.md
@@ -39,6 +39,7 @@ Windows Hello for Business provisioning enables a user to enroll a new, strong,
## Azure AD joined provisioning in a Managed environment
+[Full size image](images/howitworks/prov-aadj-managed.png)
| Phase | Description |
| :----: | :----------- |
@@ -50,6 +51,7 @@ Windows Hello for Business provisioning enables a user to enroll a new, strong,
[Return to top](#windows-hello-for-business-provisioning)
## Azure AD joined provisioning in a Federated environment
+[Full size image](images/howitworks/prov-aadj-federated.png)
| Phase | Description |
| :----: | :----------- |
@@ -60,7 +62,7 @@ Windows Hello for Business provisioning enables a user to enroll a new, strong,
[Return to top](#windows-hello-for-business-provisioning)
## Hybrid Azure AD joined provisioning in a Key Trust deployment in a Managed environment
-
+[Full size image](images/howitworks/prov-haadj-keytrust-managed.png)
| Phase | Description |
|:-----:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -78,7 +80,7 @@ Windows Hello for Business provisioning enables a user to enroll a new, strong,
[Return to top](#windows-hello-for-business-provisioning)
## Hybrid Azure AD joined provisioning in a synchronous Certificate Trust deployment in a Federated environment
-
+[Full size image](images/howitworks/prov-haadj-instant-certtrust-federated.png)
| Phase | Description |
|:-----:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
@@ -96,6 +98,7 @@ Windows Hello for Business provisioning enables a user to enroll a new, strong,
[Return to top](#windows-hello-for-business-provisioning)
## Domain joined provisioning in an On-premises Key Trust deployment
+[Full size image](images/howitworks/prov-onprem-keytrust.png)
| Phase | Description |
| :----: | :----------- |
@@ -107,6 +110,7 @@ Windows Hello for Business provisioning enables a user to enroll a new, strong,
[Return to top](#windows-hello-for-business-provisioning)
## Domain joined provisioning in an On-premises Certificate Trust deployment
+[Full size image](images/howitworks/prov-onprem-certtrust.png)
| Phase | Description |
| :----: | :----------- |
diff --git a/windows/security/identity-protection/hello-for-business/hello-manage-in-organization.md b/windows/security/identity-protection/hello-for-business/hello-manage-in-organization.md
index aa4b9b590a..d6d92affa4 100644
--- a/windows/security/identity-protection/hello-for-business/hello-manage-in-organization.md
+++ b/windows/security/identity-protection/hello-for-business/hello-manage-in-organization.md
@@ -41,151 +41,32 @@ The following table lists the Group Policy settings that you can configure for W
> [!NOTE]
> Starting with Windows 10, version 1709, the location of the PIN complexity section of the Group Policy is: **Computer Configuration** > **Administrative Templates** > **System** > **PIN Complexity**.
-
-
-| Policy |
-Scope |
-Options |
-
-
-| Use Windows Hello for Business |
- |
-Computer or user |
-
- Not configured: Device does not provision Windows Hello for Business for any user.
-Enabled: Device provisions Windows Hello for Business using keys or certificates for all users.
-Disabled: Device does not provision Windows Hello for Business for any user.
- |
-
-
-| Use a hardware security device |
- |
-Computer |
-
- Not configured: Windows Hello for Business will be provisioned using TPM if available, and will be provisioned using software if TPM is not available.
-Enabled: Windows Hello for Business will only be provisioned using TPM. This feature will provision Windows Hello for Business using TPM 1.2 unless the option to exclude them is explicitly set.
-Disabled: Windows Hello for Business will be provisioned using TPM if available, and will be provisioned using software if TPM is not available.
- |
-
-
-| Use certificate for on-premises authentication |
- |
-Computer or user |
-
- Not configured: Windows Hello for Business enrolls a key that is used for on-premises authentication.
-Enabled: Windows Hello for Business enrolls a sign-in certificate using ADFS that is used for on-premises authentication.
-Disabled: Windows Hello for Business enrolls a key that is used for on-premises authentication.
- |
-
-Use PIN recovery |
- |
-Computer |
-
- Added in Windows 10, version 1703
-Not configured: Windows Hello for Business does not create or store a PIN recovery secret. PIN reset does not use the Azure-based PIN recovery service.
-Enabled: Windows Hello for Business uses the Azure-based PIN recovery service for PIN reset.
-Disabled: Windows Hello for Business does not create or store a PIN recovery secret. PIN reset does not use the Azure-based PIN recovery service.
-
+|Policy|Scope|Options|
+|--- |--- |--- |
+|Use Windows Hello for Business|Computer or user| Not configured: Device does not provision Windows Hello for Business for any user. Enabled: Device provisions Windows Hello for Business using keys or certificates for all users. Disabled: Device does not provision Windows Hello for Business for any user.|
+|Use a hardware security device|Computer| Not configured: Windows Hello for Business will be provisioned using TPM if available, and will be provisioned using software if TPM is not available. Enabled: Windows Hello for Business will only be provisioned using TPM. This feature will provision Windows Hello for Business using TPM 1.2 unless the option to exclude them is explicitly set. Disabled: Windows Hello for Business will be provisioned using TPM if available, and will be provisioned using software if TPM is not available.|
+|Use certificate for on-premises authentication|Computer or user| Not configured: Windows Hello for Business enrolls a key that is used for on-premises authentication. Enabled: Windows Hello for Business enrolls a sign-in certificate using ADFS that is used for on-premises authentication. Disabled: Windows Hello for Business enrolls a key that is used for on-premises authentication.|
+|Use PIN recovery|Computer| Added in Windows 10, version 1703 Not configured: Windows Hello for Business does not create or store a PIN recovery secret. PIN reset does not use the Azure-based PIN recovery service Enabled: Windows Hello for Business uses the Azure-based PIN recovery service for PIN reset Disabled: Windows Hello for Business does not create or store a PIN recovery secret. PIN reset does not use the Azure-based PIN recovery service. For more information about using the PIN recovery service for PIN reset see [Windows Hello for Business PIN Reset](hello-feature-pin-reset.md).|
+|Use biometrics|Computer| Not configured: Biometrics can be used as a gesture in place of a PIN Enabled: Biometrics can be used as a gesture in place of a PIN. Disabled: Only a PIN can be used as a gesture.|
-For more information about using the PIN recovery service for PIN reset see [Windows Hello for Business PIN Reset](hello-feature-pin-reset.md).
-
- |
-
-
-| Use biometrics |
- |
-Computer |
-
- Not configured: Biometrics can be used as a gesture in place of a PIN.
-Enabled: Biometrics can be used as a gesture in place of a PIN.
-Disabled: Only a PIN can be used as a gesture.
- |
-
-
-| PIN Complexity |
-Require digits |
-Computer |
-
- Not configured: Users must include a digit in their PIN.
-Enabled: Users must include a digit in their PIN.
-Disabled: Users cannot use digits in their PIN.
- |
-
-
-| Require lowercase letters |
-Computer |
-
- Not configured: Users cannot use lowercase letters in their PIN.
-Enabled: Users must include at least one lowercase letter in their PIN.
-Disabled: Users cannot use lowercase letters in their PIN.
- |
-
-
-| Maximum PIN length |
-Computer |
-
- Not configured: PIN length must be less than or equal to 127.
-Enabled: PIN length must be less than or equal to the number you specify.
-Disabled: PIN length must be less than or equal to 127.
- |
-
-
-| Minimum PIN length |
-Computer |
-
- Not configured: PIN length must be greater than or equal to 4.
-Enabled: PIN length must be greater than or equal to the number you specify.
-Disabled: PIN length must be greater than or equal to 4.
- |
-
-
-| Expiration |
-Computer |
-
- Not configured: PIN does not expire.
-Enabled: PIN can be set to expire after any number of days between 1 and 730, or PIN can be set to never expire by setting policy to 0.
-Disabled: PIN does not expire.
- |
-
-
-| History |
-Computer |
-
- Not configured: Previous PINs are not stored.
-Enabled: Specify the number of previous PINs that can be associated to a user account that can't be reused.
-Disabled: Previous PINs are not stored.
-Note Current PIN is included in PIN history.
-
- |
-
-
-| Require special characters |
-Computer |
-
- Not configured: Users cannot include a special character in their PIN.
-Enabled: Users must include at least one special character in their PIN.
-Disabled: Users cannot include a special character in their PIN.
- |
-
-
-| Require uppercase letters |
-Computer |
-
- Not configured: Users cannot include an uppercase letter in their PIN.
-Enabled: Users must include at least one uppercase letter in their PIN.
-Disabled: Users cannot include an uppercase letter in their PIN.
- |
-
-
-| Phone Sign-in |
-Use Phone Sign-in |
-Computer |
-
-
- Not currently supported.
- |
-
-
+### PIN Complexity
+
+|Policy|Scope|Options|
+|--- |--- |--- |
+|Require digits|Computer|Not configured: Users must include a digit in their PIN.
Enabled: Users must include a digit in their PIN.
Disabled: Users cannot use digits in their PIN.|
+|Require lowercase letters|Computer|
Not configured: Users cannot use lowercase letters in their PIN
Enabled: Users must include at least one lowercase letter in their PIN.
Disabled: Users cannot use lowercase letters in their PIN.|
+|Maximum PIN length|Computer|
Not configured: PIN length must be less than or equal to 127.
Enabled: PIN length must be less than or equal to the number you specify.
Disabled: PIN length must be less than or equal to 127.|
+|Minimum PIN length|Computer|
Not configured: PIN length must be greater than or equal to 4.
Enabled: PIN length must be greater than or equal to the number you specify.
Disabled: PIN length must be greater than or equal to 4.|
+|Expiration|Computer|
Not configured: PIN does not expire.
Enabled: PIN can be set to expire after any number of days between 1 and 730, or PIN can be set to never expire by setting policy to 0.
Disabled: PIN does not expire.|
+|History|Computer|
Not configured: Previous PINs are not stored.
Enabled: Specify the number of previous PINs that can be associated to a user account that can't be reused.
Disabled: Previous PINs are not stored.
Note Current PIN is included in PIN history.
|
+|Require special characters|Computer|Not configured: Windows allows, but does not require, special characters in the PIN.
Enabled: Windows requires the user to include at least one special character in their PIN.
Disabled: Windows does not allow the user to include special characters in their PIN.|
+|Require uppercase letters|Computer|
Not configured: Users cannot include an uppercase letter in their PIN.
Enabled: Users must include at least one uppercase letter in their PIN.
Disabled: Users cannot include an uppercase letter in their PIN.|
+
+### Phone Sign-in
+
+|Policy|Scope|Options|
+|--- |--- |--- |
+|Use Phone Sign-in|Computer|Not currently supported.|
## MDM policy settings for Windows Hello for Business
@@ -194,175 +75,38 @@ The following table lists the MDM policy settings that you can configure for Win
>[!IMPORTANT]
>Starting in Windows 10, version 1607, all devices only have one PIN associated with Windows Hello for Business. This means that any PIN on a device will be subject to the policies specified in the PassportForWork CSP. The values specified take precedence over any complexity rules set via Exchange ActiveSync (EAS) or the DeviceLock CSP.
-
-
-| Policy |
-Scope |
-Default |
-Options |
-
-
-| UsePassportForWork |
- |
-Device or user |
-True |
-
- True: Windows Hello for Business will be provisioned for all users on the device.
-False: Users will not be able to provision Windows Hello for Business.
-Note If Windows Hello for Business is enabled, and then the policy is changed to False, users who previously set up Windows Hello for Business can continue to use it, but will not be able to set up Windows Hello for Business on other devices.
-
- |
-
-
-| RequireSecurityDevice |
- |
-Device or user |
-False |
-
- True: Windows Hello for Business will only be provisioned using TPM.
-False: Windows Hello for Business will be provisioned using TPM if available, and will be provisioned using software if TPM is not available.
- |
-
-
-| ExcludeSecurityDevice |
-TPM12 |
-Device |
-False |
-
- Added in Windows 10, version 1703
-True: TPM revision 1.2 modules will be disallowed from being used with Windows Hello for Business.
-False: TPM revision 1.2 modules will be allowed to be used with Windows Hello for Business.
- |
-
-
-| EnablePinRecovery |
- |
-Device or user |
-False |
-
- Added in Windows 10, version 1703
-True: Windows Hello for Business uses the Azure-based PIN recovery service for PIN reset.
-False: Windows Hello for Business does not create or store a PIN recovery secret. PIN reset does not use the Azure-based PIN recovery service.
-
+|Policy|Scope|Default|Options|
+|--- |--- |--- |--- |
+|UsePassportForWork|Device or user|True| True: Windows Hello for Business will be provisioned for all users on the device. False: Users will not be able to provision Windows Hello for Business. **Note:** If Windows Hello for Business is enabled, and then the policy is changed to False, users who previously set up Windows Hello for Business can continue to use it, but will not be able to set up Windows Hello for Business on other devices |
+|RequireSecurityDevice|Device or user|False|True: Windows Hello for Business will only be provisioned using TPM. False: Windows Hello for Business will be provisioned using TPM if available, and will be provisioned using software if TPM is not available.|
+|ExcludeSecurityDevice TPM12|Device|False|Added in Windows 10, version 1703 True: TPM revision 1.2 modules will be disallowed from being used with Windows Hello for Business. False: TPM revision 1.2 modules will be allowed to be used with Windows Hello for Business.|
+|EnablePinRecovery|Device or use|False| Added in Windows 10, version 1703 True: Windows Hello for Business uses the Azure-based PIN recovery service for PIN reset. False: Windows Hello for Business does not create or store a PIN recovery secret. PIN reset does not use the Azure-based PIN recovery service.For more information about using the PIN recovery service for PIN reset see [Windows Hello for Business PIN Reset](hello-feature-pin-reset.md).|
-For more information about using the PIN recovery service for PIN reset see [Windows Hello for Business PIN Reset](hello-feature-pin-reset.md).
-
- |
-
-
-| Biometrics |
-
- UseBiometrics
- |
-Device |
-False |
-
- True: Biometrics can be used as a gesture in place of a PIN for domain sign-in.
-False: Only a PIN can be used as a gesture for domain sign-in.
- |
-
-
-|
- FacialFeaturesUser
-EnhancedAntiSpoofing
- |
-Device |
-Not configured |
-
- Not configured: users can choose whether to turn on enhanced anti-spoofing.
-True: Enhanced anti-spoofing is required on devices which support it.
-False: Users cannot turn on enhanced anti-spoofing.
- |
-
-
-| PINComplexity |
-
-
-| Digits |
-Device or user |
-1 |
-
- 0: Digits are allowed.
-1: At least one digit is required.
-2: Digits are not allowed.
- |
-
-
-| Lowercase letters |
-Device or user |
-2 |
-
- 0: Lowercase letters are allowed.
-1: At least one lowercase letter is required.
-2: Lowercase letters are not allowed.
- |
-
-
-| Special characters |
-Device or user |
-2 |
-
- 0: Special characters are allowed.
-1: At least one special character is required.
-2: Special characters are not allowed.
- |
-
-
-| Uppercase letters |
-Device or user |
-2 |
-
- 0: Uppercase letters are allowed.
-1: At least one uppercase letter is required.
-2: Uppercase letters are not allowed.
- |
-
-
-| Maximum PIN length |
-Device or user |
-127 |
-
- Maximum length that can be set is 127. Maximum length cannot be less than minimum setting.
- |
-
-
-| Minimum PIN length |
-Device or user |
-4 |
-
- Minimum length that can be set is 4. Minimum length cannot be greater than maximum setting.
- |
-
-
-| Expiration |
-Device or user |
-0 |
-
- Integer value specifies the period of time (in days) that a PIN can be used before the system requires the user to change it. The largest number you can configure for this policy setting is 730. The lowest number you can configure for this policy setting is 0. If this policy is set to 0, then the user's PIN will never expire.
-
- |
-
-
-| History |
-Device or user |
-0 |
-
- Integer value that specifies the number of past PINs that can be associated to a user account that can't be reused. The largest number you can configure for this policy setting is 50. The lowest number you can configure for this policy setting is 0. If this policy is set to 0, then storage of previous PINs is not required.
-
- |
-
-
-| Remote |
-
- UseRemotePassport
- |
-Device or user |
-False |
-
- Not currently supported.
- |
-
-
+### Biometrics
+
+|Policy|Scope|Default|Options|
+|--- |--- |--- |--- |
+|UseBiometrics|Device |False|True: Biometrics can be used as a gesture in place of a PIN for domain sign-in.
False: Only a PIN can be used as a gesture for domain sign-in.|
+|
FacialFeaturesUser
EnhancedAntiSpoofing|Device|Not configured|
Not configured: users can choose whether to turn on enhanced anti-spoofing.
True: Enhanced anti-spoofing is required on devices which support it.
False: Users cannot turn on enhanced anti-spoofing.|
+
+### PINComplexity
+
+|Policy|Scope|Default|Options|
+|--- |--- |--- |--- |
+|Digits |Device or user|1 |
0: Digits are allowed.
1: At least one digit is required.
2: Digits are not allowed.|
+|Lowercase letters |Device or user|2|
0: Lowercase letters are allowed.
1: At least one lowercase letter is required.
2: Lowercase letters are not allowed.|
+|Special characters|Device or user|2|
0: Special characters are allowed.
1: At least one special character is required.
2: Special characters are not allowed.|
+|Uppercase letters|Device or user|2|
0: Uppercase letters are allowed.
1: At least one uppercase letter is required.
2: Uppercase letters are not allowed.|
+|Maximum PIN length |Device or user|127 |
Maximum length that can be set is 127. Maximum length cannot be less than minimum setting.|
+|Minimum PIN length|Device or user|4|
Minimum length that can be set is 4. Minimum length cannot be greater than maximum setting.|
+|Expiration |Device or user|0|
Integer value specifies the period of time (in days) that a PIN can be used before the system requires the user to change it. The largest number you can configure for this policy setting is 730. The lowest number you can configure for this policy setting is 0. If this policy is set to 0, then the user's PIN will never expire.|
+|History|Device or user|0|
Integer value that specifies the number of past PINs that can be associated to a user account that can't be reused. The largest number you can configure for this policy setting is 50. The lowest number you can configure for this policy setting is 0. If this policy is set to 0, then storage of previous PINs is not required.|
+
+### Remote
+
+|Policy|Scope|Default|Options|
+|--- |--- |--- |--- |
+|UseRemotePassport|Device or user|False|Not currently supported.|
>[!NOTE]
> In Windows 10, version 1709 and later, if policy is not configured to explicitly require letters or special characters, users can optionally set an alphanumeric PIN. Prior to version 1709 the user is required to set a numeric PIN.
@@ -379,7 +123,7 @@ All PIN complexity policies, are grouped separately from feature enablement and
>[!NOTE]
> Windows Hello for Business policy conflict resolution logic does not respect the ControlPolicyConflict/MDMWinsOverGP policy in the Policy CSP.
-
+>
>Examples
>
>The following are configured using computer Group Policy:
@@ -424,4 +168,4 @@ If you want to use Windows Hello for Business with certificates, you'll need a d
- [Windows Hello and password changes](hello-and-password-changes.md)
- [Windows Hello errors during PIN creation](hello-errors-during-pin-creation.md)
- [Event ID 300 - Windows Hello successfully created](hello-event-300.md)
-- [Windows Hello biometrics in the enterprise](hello-biometrics-in-enterprise.md)
\ No newline at end of file
+- [Windows Hello biometrics in the enterprise](hello-biometrics-in-enterprise.md)
diff --git a/windows/security/identity-protection/user-account-control/how-user-account-control-works.md b/windows/security/identity-protection/user-account-control/how-user-account-control-works.md
index 1c79103493..b1e9071045 100644
--- a/windows/security/identity-protection/user-account-control/how-user-account-control-works.md
+++ b/windows/security/identity-protection/user-account-control/how-user-account-control-works.md
@@ -107,169 +107,35 @@ The following diagram details the UAC architecture.
To better understand each component, review the table below:
-
-
-| Component |
-Description |
-
-
-| User |
-
-
-|
- User performs operation requiring privilege
- |
-
- If the operation changes the file system or registry, Virtualization is called. All other operations call ShellExecute.
- |
-
-
-|
- ShellExecute
- |
-
- ShellExecute calls CreateProcess. ShellExecute looks for the ERROR_ELEVATION_REQUIRED error from CreateProcess. If it receives the error, ShellExecute calls the Application Information service to attempt to perform the requested task with the elevated prompt.
- |
-
-
-|
- CreateProcess
- |
-
- If the application requires elevation, CreateProcess rejects the call with ERROR_ELEVATION_REQUIRED.
- |
-
-
-| System |
-
-
-|
- Application Information service
- |
-
- A system service that helps start apps that require one or more elevated privileges or user rights to run, such as local administrative tasks, and apps that require higher integrity levels. The Application Information service helps start such apps by creating a new process for the application with an administrative user's full access token when elevation is required and (depending on Group Policy) consent is given by the user to do so.
- |
-
-
-|
- Elevating an ActiveX install
- |
-
- If ActiveX is not installed, the system checks the UAC slider level. If ActiveX is installed, the User Account Control: Switch to the secure desktop when prompting for elevation Group Policy setting is checked.
- |
-
-
-|
- Check UAC slider level
- |
-
- UAC has a slider to select from four levels of notification.
-
-Always notify will:
-
-- Notify you when programs try to install software or make changes to your computer.
-- Notify you when you make changes to Windows settings.
-- Freeze other tasks until you respond.
-
-Recommended if you often install new software or visit unfamiliar websites.
-Notify me only when programs try to make changes to my computer will:
-
-- Notify you when programs try to install software or make changes to your computer.
-- Not notify you when you make changes to Windows settings.
-- Freeze other tasks until you respond.
-
-Recommended if you do not often install apps or visit unfamiliar websites.
-Notify me only when programs try to make changes to my computer (do not dim my desktop) will:
-
-- Notify you when programs try to install software or make changes to your computer.
-- Not notify you when you make changes to Windows settings.
-- Not freeze other tasks until you respond.
-
-Not recommended. Choose this only if it takes a long time to dim the desktop on your computer.
-Never notify (Disable UAC prompts) will:
-
-- Not notify you when programs try to install software or make changes to your computer.
-- Not notify you when you make changes to Windows settings.
-- Not freeze other tasks until you respond.
-
-Not recommended due to security concerns.
-
- |
-
-
-|
- Secure desktop enabled
- |
-
- The User Account Control: Switch to the secure desktop when prompting for elevation policy setting is checked:
-
--
-
If the secure desktop is enabled, all elevation requests go to the secure desktop regardless of prompt behavior policy settings for administrators and standard users.
-
--
-
If the secure desktop is not enabled, all elevation requests go to the interactive user's desktop, and the per-user settings for administrators and standard users are used.
-
-
- |
-
-
-|
- CreateProcess
- |
-
- CreateProcess calls AppCompat, Fusion, and Installer detection to assess if the app requires elevation. The file is then inspected to determine its requested execution level, which is stored in the application manifest for the file. CreateProcess fails if the requested execution level specified in the manifest does not match the access token and returns an error (ERROR_ELEVATION_REQUIRED) to ShellExecute.
- |
-
-
-|
- AppCompat
- |
-
- The AppCompat database stores information in the application compatibility fix entries for an application.
- |
-
-
-|
- Fusion
- |
-
- The Fusion database stores information from application manifests that describe the applications. The manifest schema is updated to add a new requested execution level field.
- |
-
-
-|
- Installer detection
- |
-
- Installer detection detects setup files, which helps prevent installations from being run without the user's knowledge and consent.
- |
-
-
-| Kernel |
-
-
-
-|
- Virtualization
- |
-
- Virtualization technology ensures that non-compliant apps do not silently fail to run or fail in a way that the cause cannot be determined. UAC also provides file and registry virtualization and logging for applications that write to protected areas.
- |
-
-
-|
- File system and registry
- |
-
- The per-user file and registry virtualization redirects per-computer registry and file write requests to equivalent per-user locations. Read requests are redirected to the virtualized per-user location first and to the per-computer location second.
- |
-
-
+### User
+
+|Component|Description|
+|--- |--- |
+|User performs operation requiring privilege|
If the operation changes the file system or registry, Virtualization is called. All other operations call ShellExecute.|
+|
ShellExecute|
ShellExecute calls CreateProcess. ShellExecute looks for the ERROR_ELEVATION_REQUIRED error from CreateProcess. If it receives the error, ShellExecute calls the Application Information service to attempt to perform the requested task with the elevated prompt.|
+|
CreateProcess|
If the application requires elevation, CreateProcess rejects the call with ERROR_ELEVATION_REQUIRED.|
+
+### System
+
+|Component|Description|
+|--- |--- |
+|
Application Information service|
A system service that helps start apps that require one or more elevated privileges or user rights to run, such as local administrative tasks, and apps that require higher integrity levels. The Application Information service helps start such apps by creating a new process for the application with an administrative user's full access token when elevation is required and (depending on Group Policy) consent is given by the user to do so.|
+|
Elevating an ActiveX install|
If ActiveX is not installed, the system checks the UAC slider level. If ActiveX is installed, the **User Account Control: Switch to the secure desktop when prompting for elevation** Group Policy setting is checked.|
+|
Check UAC slider level|
UAC has a slider to select from four levels of notification.
**Always notify** will:
- Notify you when programs try to install software or make changes to your computer.
- Notify you when you make changes to Windows settings.
- Freeze other tasks until you respond.
Recommended if you often install new software or visit unfamiliar websites.
**Notify me only when programs try to make changes to my computer** will:
- Notify you when programs try to install software or make changes to your computer.
- Not notify you when you make changes to Windows settings.
- Freeze other tasks until you respond.
Recommended if you do not often install apps or visit unfamiliar websites.
**Notify me only when programs try to make changes to my computer (do not dim my desktop)** will:
- Notify you when programs try to install software or make changes to your computer.
- Not notify you when you make changes to Windows settings.
- Not freeze other tasks until you respond.
Not recommended. Choose this only if it takes a long time to dim the desktop on your computer.
**Never notify (Disable UAC prompts)** will:
- Not notify you when programs try to install software or make changes to your computer.
- Not notify you when you make changes to Windows settings.
- Not freeze other tasks until you respond.
Not recommended due to security concerns.|
+|
Secure desktop enabled|
The **User Account Control: Switch to the secure desktop when prompting for elevation** policy setting is checked:
If the secure desktop is enabled, all elevation requests go to the secure desktop regardless of prompt behavior policy settings for administrators and standard users.
If the secure desktop is not enabled, all elevation requests go to the interactive user's desktop, and the per-user settings for administrators and standard users are used.|
+|
CreateProcess|
CreateProcess calls AppCompat, Fusion, and Installer detection to assess if the app requires elevation. The file is then inspected to determine its requested execution level, which is stored in the application manifest for the file. CreateProcess fails if the requested execution level specified in the manifest does not match the access token and returns an error (ERROR_ELEVATION_REQUIRED) to ShellExecute.|
+|
AppCompat|
The AppCompat database stores information in the application compatibility fix entries for an application.|
+|
Fusion|
The Fusion database stores information from application manifests that describe the applications. The manifest schema is updated to add a new requested execution level field.|
+|
Installer detection|
Installer detection detects setup files, which helps prevent installations from being run without the user's knowledge and consent.|
+
+### Kernel
+
+|Component|Description|
+|--- |--- |
+|
Virtualization|
Virtualization technology ensures that non-compliant apps do not silently fail to run or fail in a way that the cause cannot be determined. UAC also provides file and registry virtualization and logging for applications that write to protected areas.|
+|
File system and registry|
The per-user file and registry virtualization redirects per-computer registry and file write requests to equivalent per-user locations. Read requests are redirected to the virtualized per-user location first and to the per-computer location second.|
-The slider will never turn UAC completely off. If you set it to Never notify, it will:
+The slider will never turn UAC completely off. If you set it to **Never notify**, it will:
- Keep the UAC service running.
- Cause all elevation request initiated by administrators to be auto-approved without showing a UAC prompt.
diff --git a/windows/security/identity-protection/vpn/vpn-authentication.md b/windows/security/identity-protection/vpn/vpn-authentication.md
index f03cb37b27..70d6af4858 100644
--- a/windows/security/identity-protection/vpn/vpn-authentication.md
+++ b/windows/security/identity-protection/vpn/vpn-authentication.md
@@ -23,15 +23,54 @@ In addition to older and less-secure password-based authentication methods (whic
Windows supports a number of EAP authentication methods.
-
-| Method | Details |
|---|
-
-| EAP-Microsoft Challenge Handshake Authentication Protocol version 2 (EAP-MSCHAPv2) | - User name and password authentication
- Winlogon credentials - can specify authentication with computer sign-in credentials
|
-| EAP-Transport Layer Security (EAP-TLS) | - Supports the following types of certificate authentication
- Certificate with keys in the software Key Storage Provider (KSP)
- Certificate with keys in Trusted Platform Module (TPM) KSP
- Smart card certificates
- Windows Hello for Business certificate
- Certificate filtering
- Certificate filtering can be enabled to search for a particular certificate to use to authenticate with
- Filtering can be Issuer-based or Enhanced Key Usage (EKU)-based
- Server validation - with TLS, server validation can be toggled on or off
- Server name - specify the server to validate
- Server certificate - trusted root certificate to validate the server
- Notification - specify if the user should get a notification asking whether to trust the server or not
|
-| Protected Extensible Authentication Protocol (PEAP) | - Server validation - with PEAP, server validation can be toggled on or off
- Server name - specify the server to validate
- Server certificate - trusted root certificate to validate the server
- Notification - specify if the user should get a notification asking whether to trust the server or not
- Inner method - the outer method creates a secure tunnel inside while the inner method is used to complete the authentication
- Fast Reconnect: reduces the delay between an authentication request by a client and the response by the Network Policy Server (NPS) or other Remote Authentication Dial-in User Service (RADIUS) server. This reduces resource requirements for both client and server, and minimizes the number of times that users are prompted for credentials.
- Cryptobinding: By deriving and exchanging values from the PEAP phase 1 key material (Tunnel Key) and from the PEAP phase 2 inner EAP method key material (Inner Session Key), it is possible to prove that the two authentications terminate at the same two entities (PEAP peer and PEAP server). This process, termed "cryptobinding", is used to protect the PEAP negotiation against "Man in the Middle" attacks.
|
-| Tunneled Transport Layer Security (TTLS) | - Inner method
- Non-EAP
- Password Authentication Protocol (PAP)
- CHAP
- MSCHAP
- MSCHAPv2
- EAP
- Server validation: in TTLS, the server must be validated. The following can be configured:
- Server name
- Trusted root certificate for server certificate
- Whether there should be a server validation notification
|
-
-
+- EAP-Microsoft Challenge Handshake Authentication Protocol version 2 (EAP-MSCHAPv2):
+ - User name and password authentication
+ - Winlogon credentials - can specify authentication with computer sign-in credentials
+
+- EAP-Transport Layer Security (EAP-TLS):
+ - Supports the following types of certificate authentication:
+ - Certificate with keys in the software Key Storage Provider (KSP)
+ - Certificate with keys in Trusted Platform Module (TPM) KSP
+ - Smart card certificates
+ - Windows Hello for Business certificate
+
+ - Certificate filtering:
+ - Certificate filtering can be enabled to search for a particular certificate to use to authenticate with
+ - Filtering can be Issuer-based or Enhanced Key Usage (EKU)-based
+
+ - Server validation - with TLS, server validation can be toggled on or off:
+ - Server name - specify the server to validate
+ - Server certificate - trusted root certificate to validate the server
+ - Notification - specify if the user should get a notification asking whether to trust the server or not
+
+- [Protected Extensible Authentication Protocol (PEAP)](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc754179(v=ws.11)):
+ - Server validation - with PEAP, server validation can be toggled on or off:
+ - Server name - specify the server to validate
+ - Server certificate - trusted root certificate to validate the server
+ - Notification - specify if the user should get a notification asking whether to trust the server or not
+
+ - Inner method - the outer method creates a secure tunnel inside while the inner method is used to complete the authentication:
+ - EAP-MSCHAPv2
+ - EAP-TLS
+
+ - Fast Reconnect: reduces the delay between an authentication request by a client and the response by the Network Policy Server (NPS) or other Remote Authentication Dial-in User Service (RADIUS) server. This reduces resource requirements for both client and server, and minimizes the number of times that users are prompted for credentials.
+
+ - [Cryptobinding](/openspecs/windows_protocols/ms-peap/757a16c7-0826-4ba9-bb71-8c3f1339e937): By deriving and exchanging values from the PEAP phase 1 key material (**Tunnel Key**) and from the PEAP phase 2 inner EAP method key material (**Inner Session Key**), it is possible to prove that the two authentications terminate at the same two entities (PEAP peer and PEAP server). This process, termed "cryptobinding", is used to protect the PEAP negotiation against "Man in the Middle" attacks.
+
+- Tunneled Transport Layer Security (TTLS)
+ - Inner method
+ - Non-EAP
+ - Password Authentication Protocol (PAP)
+ - CHAP
+ - MSCHAP
+ - MSCHAPv2
+ - EAP
+ - MSCHAPv2
+ - TLS
+ - Server validation: in TTLS, the server must be validated. The following can be configured:
+ - Server name
+ - Trusted root certificate for server certificate
+ - Whether there should be a server validation notification
For a UWP VPN plug-in, the app vendor controls the authentication method to be used. The following credential types can be used:
diff --git a/windows/security/identity.md b/windows/security/identity.md
index 0cfa07beba..7e2e8ca4b9 100644
--- a/windows/security/identity.md
+++ b/windows/security/identity.md
@@ -13,7 +13,7 @@ ms.prod: m365-security
ms.technology: windows-sec
---
-# Windows identity and user security
+# Windows identity and privacy
Malicious actors launch millions of password attacks every day. Weak passwords, password spraying, and phishing are the entry point for many attacks. Knowing that the right user is accessing the right device and the right data is critical to keeping your business, family, and self, safe and secure. Windows Hello, Windows Hello for Business, and Credential Guard enable customers to move to passwordless multifactor authentication (MFA). MFA can reduce the risk of compromise in organizations.
diff --git a/windows/security/information-protection/bitlocker/bitlocker-basic-deployment.md b/windows/security/information-protection/bitlocker/bitlocker-basic-deployment.md
index 53c4a062f3..dfac592fab 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-basic-deployment.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-basic-deployment.md
@@ -185,132 +185,20 @@ manage-bde -on C:
Windows PowerShell cmdlets provide an alternative way to work with BitLocker. Using Windows PowerShell's scripting capabilities, administrators can integrate BitLocker options into existing scripts with ease. The list below displays the available BitLocker cmdlets.
-
-
-
-
-
-
-
-Name |
-Parameters |
-
-
-Add-BitLockerKeyProtector |
--ADAccountOrGroup
--ADAccountOrGroupProtector
--Confirm
--MountPoint
--Password
--PasswordProtector
--Pin
--RecoveryKeyPath
--RecoveryKeyProtector
--RecoveryPassword
--RecoveryPasswordProtector
--Service
--StartupKeyPath
--StartupKeyProtector
--TpmAndPinAndStartupKeyProtector
--TpmAndPinProtector
--TpmAndStartupKeyProtector
--TpmProtector
--WhatIf |
-
-
-Backup-BitLockerKeyProtector |
--Confirm
--KeyProtectorId
--MountPoint
--WhatIf |
-
-
-Disable-BitLocker |
--Confirm
--MountPoint
--WhatIf |
-
-
-Disable-BitLockerAutoUnlock |
--Confirm
--MountPoint
--WhatIf |
-
-
-Enable-BitLocker |
--AdAccountOrGroup
--AdAccountOrGroupProtector
--Confirm
--EncryptionMethod
--HardwareEncryption
--Password
--PasswordProtector
--Pin
--RecoveryKeyPath
--RecoveryKeyProtector
--RecoveryPassword
--RecoveryPasswordProtector
--Service
--SkipHardwareTest
--StartupKeyPath
--StartupKeyProtector
--TpmAndPinAndStartupKeyProtector
--TpmAndPinProtector
--TpmAndStartupKeyProtector
--TpmProtector
--UsedSpaceOnly
--WhatIf |
-
-
-Enable-BitLockerAutoUnlock |
--Confirm
--MountPoint
--WhatIf |
-
-
-Get-BitLockerVolume |
--MountPoint |
-
-
-Lock-BitLocker |
--Confirm
--ForceDismount
--MountPoint
--WhatIf |
-
-
-Remove-BitLockerKeyProtector |
--Confirm
--KeyProtectorId
--MountPoint
--WhatIf |
-
-
-Resume-BitLocker |
--Confirm
--MountPoint
--WhatIf |
-
-
-Suspend-BitLocker |
--Confirm
--MountPoint
--RebootCount
--WhatIf |
-
-
-Unlock-BitLocker |
--AdAccountOrGroup
--Confirm
--MountPoint
--Password
--RecoveryKeyPath
--RecoveryPassword
--RecoveryPassword
--WhatIf |
-
-
-
+|Name|Parameters|
+|--- |--- |
+|**Add-BitLockerKeyProtector**|- ADAccountOrGroup
- ADAccountOrGroupProtector
- Confirm
- MountPoint
- Password
- PasswordProtector
- Pin
- RecoveryKeyPath
- RecoveryKeyProtector
- RecoveryPassword
- RecoveryPasswordProtector
- Service
- StartupKeyPath
- StartupKeyProtector
- TpmAndPinAndStartupKeyProtector
- TpmAndPinProtector
- TpmAndStartupKeyProtector
- TpmProtector
- WhatIf|
+|**Backup-BitLockerKeyProtector**|
- Confirm
- KeyProtectorId
- MountPoint
- WhatIf|
+|**Disable-BitLocker**|
- Confirm
- MountPoint
- WhatIf|
+|**Disable-BitLockerAutoUnlock**|
- Confirm
- MountPoint
- WhatIf|
+|**Enable-BitLocker**|
- AdAccountOrGroup
- AdAccountOrGroupProtector
- Confirm
- EncryptionMethod
- HardwareEncryption
- Password
- PasswordProtector
- Pin
- RecoveryKeyPath
- RecoveryKeyProtector
- RecoveryPassword
- RecoveryPasswordProtector
- Service
- SkipHardwareTest
- StartupKeyPath
- StartupKeyProtector
- TpmAndPinAndStartupKeyProtector
- TpmAndPinProtector
- TpmAndStartupKeyProtector
- TpmProtector
- UsedSpaceOnly
- WhatIf|
+|**Enable-BitLockerAutoUnlock**|
- Confirm
- MountPoint
- WhatIf|
+|**Get-BitLockerVolume**|
- MountPoint|
+|**Lock-BitLocker**|
- Confirm
- ForceDismount
- MountPoint
- WhatIf|
+|**Remove-BitLockerKeyProtector**|
- Confirm
- KeyProtectorId
- MountPoint
- WhatIf|
+|**Resume-BitLocker**|
- Confirm
- MountPoint
- WhatIf|
+|**Suspend-BitLocker**|
- Confirm
- MountPoint
- RebootCount
- WhatIf|
+|**Unlock-BitLocker**|
- AdAccountOrGroup
- Confirm
- MountPoint
- Password
- RecoveryKeyPath
- RecoveryPassword
- RecoveryPassword
- WhatIf|
Similar to manage-bde, the Windows PowerShell cmdlets allow configuration beyond the options offered in the control panel. As with manage-bde, users need to consider the specific needs of the volume they are encrypting prior to running Windows PowerShell cmdlets.
diff --git a/windows/security/information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md b/windows/security/information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md
index cbd4a6c3a0..2b18579a8c 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md
@@ -142,6 +142,6 @@ Part of the Microsoft Desktop Optimization Pack, MBAM makes it easier to manage
* Enforces the BitLocker encryption policy options that you set for your enterprise.
* Integrates with existing management tools, such as Microsoft Endpoint Configuration Manager.
* Offers an IT-customizable recovery user experience.
-* Supports Windows 11 and Windows 10.
+* Supports Windows 10.
-For more information about MBAM, including how to obtain it, see [Microsoft BitLocker Administration and Monitoring](/microsoft-desktop-optimization-pack/) on the MDOP TechCenter.
\ No newline at end of file
+For more information about MBAM, including how to obtain it, see [Microsoft BitLocker Administration and Monitoring](/microsoft-desktop-optimization-pack/) on the MDOP TechCenter.
diff --git a/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md b/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
index ea705ba5bc..f33bdd77ff 100644
--- a/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
+++ b/windows/security/information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
@@ -129,134 +129,20 @@ For more information about using repair-bde, see [Repair-bde](/previous-versions
Windows PowerShell cmdlets provide a new way for administrators to use when working with BitLocker. Using Windows PowerShell's scripting capabilities, administrators can integrate BitLocker options into existing scripts with ease. The list below displays the available BitLocker cmdlets.
-
-
-
-
-
-
-
-
-
-
-Add-BitLockerKeyProtector |
--ADAccountOrGroup
--ADAccountOrGroupProtector
--Confirm
--MountPoint
--Password
--PasswordProtector
--Pin
--RecoveryKeyPath
--RecoveryKeyProtector
--RecoveryPassword
--RecoveryPasswordProtector
--Service
--StartupKeyPath
--StartupKeyProtector
--TpmAndPinAndStartupKeyProtector
--TpmAndPinProtector
--TpmAndStartupKeyProtector
--TpmProtector
--WhatIf |
-
-
-Backup-BitLockerKeyProtector |
--Confirm
--KeyProtectorId
--MountPoint
--WhatIf |
-
-
-Disable-BitLocker |
--Confirm
--MountPoint
--WhatIf |
-
-
-Disable-BitLockerAutoUnlock |
--Confirm
--MountPoint
--WhatIf |
-
-
-Enable-BitLocker |
--AdAccountOrGroup
--AdAccountOrGroupProtector
--Confirm
--EncryptionMethod
--HardwareEncryption
--Password
--PasswordProtector
--Pin
--RecoveryKeyPath
--RecoveryKeyProtector
--RecoveryPassword
--RecoveryPasswordProtector
--Service
--SkipHardwareTest
--StartupKeyPath
--StartupKeyProtector
--TpmAndPinAndStartupKeyProtector
--TpmAndPinProtector
--TpmAndStartupKeyProtector
--TpmProtector
--UsedSpaceOnly
--WhatIf |
-
-
-Enable-BitLockerAutoUnlock |
--Confirm
--MountPoint
--WhatIf |
-
-
-Get-BitLockerVolume |
--MountPoint |
-
-
-Lock-BitLocker |
--Confirm
--ForceDismount
--MountPoint
--WhatIf |
-
-
-Remove-BitLockerKeyProtector |
--Confirm
--KeyProtectorId
--MountPoint
--WhatIf |
-
-
-Resume-BitLocker |
--Confirm
--MountPoint
--WhatIf |
-
-
-Suspend-BitLocker |
--Confirm
--MountPoint
--RebootCount
--WhatIf |
-
-
-Unlock-BitLocker |
--AdAccountOrGroup
--Confirm
--MountPoint
--Password
--RecoveryKeyPath
--RecoveryPassword
--RecoveryPassword
--WhatIf |
-
-
-
+|Name|Parameters|
+|--- |--- |
+|**Add-BitLockerKeyProtector**| - ADAccountOrGroup
- ADAccountOrGroupProtector
- Confirm
- MountPoint
- Password
- PasswordProtector
- Pin
- RecoveryKeyPath
- RecoveryKeyProtector
- RecoveryPassword
- RecoveryPasswordProtector
- Service
- StartupKeyPath
- StartupKeyProtector
- TpmAndPinAndStartupKeyProtector
- TpmAndPinProtector
- TpmAndStartupKeyProtector
- TpmProtector
- WhatIf|
+|**Backup-BitLockerKeyProtector**|
- Confirm
- KeyProtectorId
- MountPoint
- WhatIf|
+|**Disable-BitLocker**|
- Confirm
- MountPoint
- WhatIf|
+|**Disable-BitLockerAutoUnlock**|
- Confirm
- MountPoint
- WhatIf|
+|**Enable-BitLocker**|
- AdAccountOrGroup
- AdAccountOrGroupProtector
- Confirm
- EncryptionMethod
- HardwareEncryption
- Password
- PasswordProtector
- Pin
- RecoveryKeyPath
- RecoveryKeyProtector
- RecoveryPassword
- RecoveryPasswordProtector
- Service
- SkipHardwareTest
- StartupKeyPath
- StartupKeyProtector
- TpmAndPinAndStartupKeyProtector
- TpmAndPinProtector
- TpmAndStartupKeyProtector
- TpmProtector
- UsedSpaceOnly
- WhatIf|
+|**Enable-BitLockerAutoUnlock**|
- Confirm
- MountPoint
- WhatIf|
+|**Get-BitLockerVolume**|
- MountPoint|
+|**Lock-BitLocker**|
- Confirm
- ForceDismount
- MountPoint
- WhatIf|
+|**Remove-BitLockerKeyProtector**|
- Confirm
- KeyProtectorId
- MountPoint
- WhatIf|
+|**Resume-BitLocker**|
- Confirm
- MountPoint
- WhatIf|
+|**Suspend-BitLocker**|
- Confirm
- MountPoint
- RebootCount
- WhatIf|
+|**Unlock-BitLocker**|
- AdAccountOrGroup
- Confirm
- MountPoint
- Password
- RecoveryKeyPath
- RecoveryPassword
- RecoveryPassword
- WhatIf|
Similar to manage-bde, the Windows PowerShell cmdlets allow configuration beyond the options offered in the control panel. As with manage-bde, users need to consider the specific needs of the volume they are encrypting prior to running Windows PowerShell cmdlets.
diff --git a/windows/security/information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md b/windows/security/information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
index e1fd9969af..d176a4f457 100644
--- a/windows/security/information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
+++ b/windows/security/information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
@@ -33,14 +33,16 @@ BitLocker can protect both physical disk resources and cluster shared volumes ve
BitLocker on volumes within a cluster are managed based on how the cluster service "views" the volume to be protected. The volume can be a physical disk resource such as a logical unit number (LUN) on a storage area network (SAN) or network attached storage (NAS).
->**Important** SANs used with BitLocker must have obtained Windows Hardware Certification. For more info, see [Windows Hardware Lab Kit](/windows-hardware/drivers/).
+> [!IMPORTANT]
+> SANs used with BitLocker must have obtained Windows Hardware Certification. For more info, see [Windows Hardware Lab Kit](/windows-hardware/drivers/).
Alternatively, the volume can be a cluster-shared volume, a shared namespace, within the cluster. Windows Server 2012 expanded the CSV architecture, now known as CSV2.0, to enable support for BitLocker. When using BitLocker with volumes designated for a cluster, the volume will need to turn on
BitLocker before its addition to the storage pool within cluster or put the resource into maintenance mode before BitLocker operations will complete.
Windows PowerShell or the manage-bde command-line interface is the preferred method to manage BitLocker on CSV2.0 volumes. This method is recommended over the BitLocker Control Panel item because CSV2.0 volumes are mount points. Mount points are an NTFS object that is used to provide an entry point to other volumes. Mount points do not require the use of a drive letter. Volumes that lack drive letters do not appear in the BitLocker Control Panel item. Additionally, the new Active Directory-based protector option required for cluster disk resource or CSV2.0 resources is not available in the Control Panel item.
->**Note:** Mount points can be used to support remote mount points on SMB based network shares. This type of share is not supported for BitLocker encryption.
+> [!NOTE]
+> Mount points can be used to support remote mount points on SMB based network shares. This type of share is not supported for BitLocker encryption.
For thinly provisioned storage, such as a Dynamic Virtual Hard Disk (VHD), BitLocker runs in Used Disk Space Only encryption mode. You cannot use the **manage-bde -WipeFreeSpace** command to transition the volume to full-volume encryption on these types of volumes. This action is blocked in order to avoid expanding thinly provisioned volumes to occupy the entire backing store while wiping the unoccupied (free) space.
@@ -57,14 +59,17 @@ You can also use an Active Directory Domain Services (AD DS) protector for prote
4. Registry-based auto-unlock key
->**Note:** A Windows Server 2012 or later domain controller is required for this feature to work properly.
+> [!NOTE]
+> A Windows Server 2012 or later domain controller is required for this feature to work properly.
### Turning on BitLocker before adding disks to a cluster using Windows PowerShell
BitLocker encryption is available for disks before or after addition to a cluster storage pool. The advantage of encrypting volumes prior to adding them to a cluster is that the disk resource does not require suspending the resource to complete the operation. To turn on BitLocker for a disk before adding it to a cluster:
1. Install the BitLocker Drive Encryption feature if it is not already installed.
+
2. Ensure the disk is formatted NTFS and has a drive letter assigned to it.
+
3. Identify the name of the cluster with Windows PowerShell.
```powershell
@@ -77,9 +82,11 @@ BitLocker encryption is available for disks before or after addition to a cluste
Enable-BitLocker E: -ADAccountOrGroupProtector -ADAccountOrGroup CLUSTER$
```
- >**Warning:** You must configure an **ADAccountOrGroup** protector using the cluster CNO for a BitLocker enabled volume to either be shared in a Cluster Shared Volume or to fail over properly in a traditional failover cluster.
+ > [!WARNING]
+ > You must configure an **ADAccountOrGroup** protector using the cluster CNO for a BitLocker enabled volume to either be shared in a Cluster Shared Volume or to fail over properly in a traditional failover cluster.
5. Repeat the preceding steps for each disk in the cluster.
+
6. Add the volume(s) to the cluster.
### Turning on BitLocker for a clustered disk using Windows PowerShell
@@ -110,7 +117,9 @@ When the cluster service owns a disk resource already, it needs to be set into m
```powershell
Enable-BitLocker E: -ADAccountOrGroupProtector -ADAccountOrGroup CLUSTER$
```
- >**Warning:** You must configure an **ADAccountOrGroup** protector using the cluster CNO for a BitLocker enabled volume to either be shared in a Cluster Shared Volume or to fail over properly in a traditional failover cluster.
+
+ > [!WARNING]
+ > You must configure an **ADAccountOrGroup** protector using the cluster CNO for a BitLocker enabled volume to either be shared in a Cluster Shared Volume or to fail over properly in a traditional failover cluster.
6. Use **Resume-ClusterResource** to take the physical disk resource back out of maintenance mode:
@@ -160,110 +169,23 @@ Unlike CSV2.0 volumes, physical disk resources can only be accessed by one clust
The following table contains information about both Physical Disk Resources (that is, traditional failover cluster volumes) and Cluster Shared Volumes (CSV) and the actions that are allowed by BitLocker in each situation.
-
-
-
-
-
-
-
-
-
-
-Action |
-On owner node of failover volume |
-On Metadata Server (MDS) of CSV |
-On (Data Server) DS of CSV |
-Maintenance Mode |
-
-
-Manage-bde –on |
-Blocked |
-Blocked |
-Blocked |
-Allowed |
-
-
-Manage-bde –off |
-Blocked |
-Blocked |
-Blocked |
-Allowed |
-
-
-Manage-bde Pause/Resume |
-Blocked |
-Blocked |
-Blocked |
-Allowed |
-
-
-Manage-bde –lock |
-Blocked |
-Blocked |
-Blocked |
-Allowed |
-
-
-manage-bde –wipe |
-Blocked |
-Blocked |
-Blocked |
-Allowed |
-
-
-Unlock |
-Automatic via cluster service |
-Automatic via cluster service |
-Automatic via cluster service |
-Allowed |
-
-
-manage-bde –protector –add |
-Allowed |
-Allowed |
-Blocked |
-Allowed |
-
-
-manage-bde -protector -delete |
-Allowed |
-Allowed |
-Blocked |
-Allowed |
-
-
-manage-bde –autounlock |
-Allowed (not recommended) |
-Allowed (not recommended) |
-Blocked |
-Allowed (not recommended) |
-
-
-Manage-bde -upgrade |
-Allowed |
-Allowed |
-Blocked |
-Allowed |
-
-
-Shrink |
-Allowed |
-Allowed |
-Blocked |
-Allowed |
-
-
-Extend |
-Allowed |
-Allowed |
-Blocked |
-Allowed |
-
-
-
-
->Note:** Although the manage-bde -pause command is Blocked in clusters, the cluster service will automatically resume a paused encryption or decryption from the MDS node
+| Action | On owner node of failover volume | On Metadata Server (MDS) of CSV | On (Data Server) DS of CSV | Maintenance Mode |
+|--- |--- |--- |--- |--- |
+|**Manage-bde –on**|Blocked|Blocked|Blocked|Allowed|
+|**Manage-bde –off**|Blocked|Blocked|Blocked|Allowed|
+|**Manage-bde Pause/Resume**|Blocked|Blocked**|Blocked|Allowed|
+|**Manage-bde –lock**|Blocked|Blocked|Blocked|Allowed|
+|**manage-bde –wipe**|Blocked|Blocked|Blocked|Allowed|
+|**Unlock**|Automatic via cluster service|Automatic via cluster service|Automatic via cluster service|Allowed|
+|**manage-bde –protector –add**|Allowed|Allowed|Blocked|Allowed|
+|**manage-bde -protector -delete**|Allowed|Allowed|Blocked|Allowed|
+|**manage-bde –autounlock**|Allowed (not recommended)|Allowed (not recommended)|Blocked|Allowed (not recommended)|
+|**Manage-bde -upgrade**|Allowed|Allowed|Blocked|Allowed|
+|**Shrink**|Allowed|Allowed|Blocked|Allowed|
+|**Extend**|Allowed|Allowed|Blocked|Allowed|
+
+> [!NOTE]
+> Although the manage-bde -pause command is Blocked in clusters, the cluster service will automatically resume a paused encryption or decryption from the MDS node
In the case where a physical disk resource experiences a failover event during conversion, the new owning node will detect the conversion is not complete and will complete the conversion process.
@@ -276,4 +198,4 @@ Also take these considerations into account for BitLocker on clustered storage:
- If conversion is paused with encryption in progress and the CSV volume is offline from the cluster, the cluster thread (health check) will automatically resume conversion when the volume is online to the cluster.
- If conversion is paused with encryption in progress and a physical disk resource volume is offline from the cluster, the BitLocker driver will automatically resume conversion when the volume is online to the cluster.
- If conversion is paused with encryption in progress, while the CSV volume is in maintenance mode, the cluster thread (health check) will automatically resume conversion when moving the volume back from maintenance.
-- If conversion is paused with encryption in progress, while the disk resource volume is in maintenance mode, the BitLocker driver will automatically resume conversion when the volume is moved back from maintenance mode.
\ No newline at end of file
+- If conversion is paused with encryption in progress, while the disk resource volume is in maintenance mode, the BitLocker driver will automatically resume conversion when the volume is moved back from maintenance mode.
diff --git a/windows/security/information-protection/windows-information-protection/app-behavior-with-wip.md b/windows/security/information-protection/windows-information-protection/app-behavior-with-wip.md
index 650b38981d..e69017b1e0 100644
--- a/windows/security/information-protection/windows-information-protection/app-behavior-with-wip.md
+++ b/windows/security/information-protection/windows-information-protection/app-behavior-with-wip.md
@@ -33,113 +33,27 @@ To avoid the automatic encryption of data, developers can enlighten apps by addi
We strongly suggest that the only unenlightened apps you add to your allowed apps list are Line-of-Business (LOB) apps.
->[!IMPORTANT]
->After revoking WIP, unenlightened apps will have to be uninstalled and re-installed since their settings files will remain encrypted.
-
->[!Note]
->For more info about creating enlightened apps, see the [Windows Information Protection (WIP)](/windows/uwp/enterprise/wip-hub) topic in the Windows Dev Center.
+> [!IMPORTANT]
+> After revoking WIP, unenlightened apps will have to be uninstalled and re-installed since their settings files will remain encrypted. For more info about creating enlightened apps, see the [Windows Information Protection (WIP)](/windows/uwp/enterprise/wip-hub) topic in the Windows Dev Center.
## Unenlightened app behavior
This table includes info about how unenlightened apps might behave, based on your Windows Information Protection (WIP) networking policies, your app configuration, and potentially whether the app connects to network resources directly by using IP addresses or by using hostnames.
-
-
- | App rule setting |
- Networking policy configuration |
-
-
- | |
- Name-based policies, without the /*AppCompat*/ string |
- Name-based policies, using the /*AppCompat*/ string or proxy-based policies |
-
-
- | Not required. App connects to enterprise cloud resources directly, using an IP address. |
-
-
- - App is entirely blocked from both personal and enterprise cloud resources.
- - No encryption is applied.
- - App can’t access local Work files.
-
- |
-
-
- - App can access both personal and enterprise cloud resources. However, you might encounter apps using policies that restrict access to enterprise cloud resources.
- - No encryption is applied.
- - App can’t access local Work files.
-
- |
-
-
- | Not required. App connects to enterprise cloud resources, using a hostname. |
-
-
- - App is blocked from accessing enterprise cloud resources, but can access other network resources.
- - No encryption is applied.
- - App can’t access local Work files.
-
- |
-
-
- | Allow. App connects to enterprise cloud resources, using an IP address or a hostname. |
-
-
- - App can access both personal and enterprise cloud resources.
- - Auto-encryption is applied.
- - App can access local Work files.
-
- |
-
-
- | Exempt. App connects to enterprise cloud resources, using an IP address or a hostname. |
-
-
- - App can access both personal and enterprise cloud resources.
- - No encryption is applied.
- - App can access local Work files.
-
- |
-
-
+|App rule setting|Networking policy configuration|
+|--- |--- |
+|**Not required.** App connects to enterprise cloud resources directly, using an IP address.| **Name-based policies, without the `/*AppCompat*/` string:** - App is entirely blocked from both personal and enterprise cloud resources.
- No encryption is applied.
- App can’t access local Work files.
**Name-based policies, using the `/*AppCompat*/` string or proxy-based policies:** - App can access both personal and enterprise cloud resources. However, you might encounter apps using policies that restrict access to enterprise cloud resources.
- No encryption is applied.
- App can’t access local Work files.|
+|**Not required.** App connects to enterprise cloud resources, using a hostname.|
- App is blocked from accessing enterprise cloud resources, but can access other network resources.
- No encryption is applied.
- App can’t access local Work files.|
+|**Allow.** App connects to enterprise cloud resources, using an IP address or a hostname.|
- App can access both personal and enterprise cloud resources.
- Auto-encryption is applied.
- App can access local Work files.|
+|**Exempt.** App connects to enterprise cloud resources, using an IP address or a hostname.|
- App can access both personal and enterprise cloud resources.
- No encryption is applied.
- App can access local Work files.|
## Enlightened app behavior
This table includes info about how enlightened apps might behave, based on your Windows Information Protection (WIP) networking policies, your app configuration, and potentially whether the app connects to network resources directly by using IP addresses or by using hostnames.
-
-
- | App rule setting |
- Networking policy configuration for name-based policies, possibly using the /*AppCompat*/ string, or proxy-based policies |
-
-
- | Not required. App connects to enterprise cloud resources, using an IP address or a hostname. |
-
-
- - App is blocked from accessing enterprise cloud resources, but can access other network resources.
- - No encryption is applied.
- - App can't access local Work files.
-
- |
-
-
- | Allow. App connects to enterprise cloud resources, using an IP address or a hostname. |
-
-
- - App can access both personal and enterprise cloud resources.
- - App protects work data and leaves personal data unprotected.
- - App can access local Work files.
-
- |
-
-
- | Exempt. App connects to enterprise cloud resources, using an IP address or a hostname. |
-
-
- - App can access both personal and enterprise cloud resources.
- - App protects work data and leaves personal data unprotected.
- - App can access local Work files.
-
- |
-
-
+|App rule setting|Networking policy configuration for name-based policies, possibly using the /*AppCompat*/ string, or proxy-based policies|
+|--- |--- |
+|**Not required.** App connects to enterprise cloud resources, using an IP address or a hostname.| - App is blocked from accessing enterprise cloud resources, but can access other network resources.
- No encryption is applied.
- App can't access local Work files.|
+|**Allow.** App connects to enterprise cloud resources, using an IP address or a hostname.|
- App can access both personal and enterprise cloud resources.
- App protects work data and leaves personal data unprotected.
- App can access local Work files.|
+|**Exempt.** App connects to enterprise cloud resources, using an IP address or a hostname.|
- App can access both personal and enterprise cloud resources.
- App protects work data and leaves personal data unprotected.
- App can access local Work files.|
>[!NOTE]
->Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Editing Windows IT professional documentation](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
+>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Editing Windows IT professional documentation](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
diff --git a/windows/security/information-protection/windows-information-protection/create-wip-policy-using-configmgr.md b/windows/security/information-protection/windows-information-protection/create-wip-policy-using-configmgr.md
index 6b49217ac9..8a0ecac521 100644
--- a/windows/security/information-protection/windows-information-protection/create-wip-policy-using-configmgr.md
+++ b/windows/security/information-protection/windows-information-protection/create-wip-policy-using-configmgr.md
@@ -155,40 +155,15 @@ For this example, we're going to add Internet Explorer, a desktop app, to the **
5. Pick the options you want to include for the app rule (see table), and then click **OK**.
-
-
- | Option |
- Manages |
-
-
- | All fields left as "*" |
- All files signed by any publisher. (Not recommended.) |
-
-
- | Publisher selected |
- All files signed by the named publisher. This might be useful if your company is the publisher and signer of internal line-of-business apps. |
-
-
- | Publisher and Product Name selected |
- All files for the specified product, signed by the named publisher. |
-
-
- | Publisher, Product Name, and Binary name selected |
- Any version of the named file or package for the specified product, signed by the named publisher. |
-
-
- | Publisher, Product Name, Binary name, and File Version, and above, selected |
- Specified version or newer releases of the named file or package for the specified product, signed by the named publisher. This option is recommended for enlightened apps that weren't previously enlightened. |
-
-
- | Publisher, Product Name, Binary name, and File Version, And below selected |
- Specified version or older releases of the named file or package for the specified product, signed by the named publisher. |
-
-
- | Publisher, Product Name, Binary name, and File Version, Exactly selected |
- Specified version of the named file or package for the specified product, signed by the named publisher. |
-
-
+ |Option|Manages|
+ |--- |--- |
+ |All fields left as "*"|All files signed by any publisher. (Not recommended.)|
+ |**Publisher** selected|All files signed by the named publisher.This might be useful if your company is the publisher and signer of internal line-of-business apps.|
+ |**Publisher** and **Product Name** selected|All files for the specified product, signed by the named publisher.|
+ |**Publisher**, **Product Name**, and **Binary name** selected|Any version of the named file or package for the specified product, signed by the named publisher.|
+ |**Publisher**, **Product Name**, **Binary name**, and **File Version, and above**, selected|Specified version or newer releases of the named file or package for the specified product, signed by the named publisher.This option is recommended for enlightened apps that weren't previously enlightened.|
+ |**Publisher**, **Product Name**, **Binary name**, and **File Version, And below** selected|Specified version or older releases of the named file or package for the specified product, signed by the named publisher.|
+ |**Publisher**, **Product Name**, **Binary name**, and **File Version, Exactly** selected|Specified version of the named file or package for the specified product, signed by the named publisher.|
If you're unsure about what to include for the publisher, you can run this PowerShell command:
@@ -374,46 +349,70 @@ There are no default locations included with WIP, you must add each of your netw
-
-
- | Network location type |
- Format |
- Description |
-
-
- | Enterprise Cloud Resources |
- With proxy: contoso.sharepoint.com,contoso.internalproxy1.com|
contoso.visualstudio.com,contoso.internalproxy2.comWithout proxy: contoso.sharepoint.com|contoso.visualstudio.com |
- Specify the cloud resources to be treated as corporate and protected by WIP. For each cloud resource, you may also optionally specify a proxy server from your Internal proxy servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Internal proxy servers is considered enterprise. If you have multiple resources, you must separate them using the "|" delimiter. If you don't use proxy servers, you must also include the "," delimiter just before the "|". For example: URL <,proxy>|URL <,proxy>. Important
In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can't tell whether it's attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the /*AppCompat*/ string to the setting. For example: URL <,proxy>|URL <,proxy>|/*AppCompat*/. |
-
-
- | Enterprise Network Domain Names (Required) |
- corp.contoso.com,region.contoso.com |
- Specify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected. This setting works with the IP ranges settings to detect whether a network endpoint is enterprise or personal on private networks. If you have multiple resources, you must separate them using the "," delimiter. |
-
-
- | Proxy servers |
- proxy.contoso.com:80;proxy2.contoso.com:443 |
- Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you're connecting to are enterprise resources.
This list shouldn't include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
-
-
- | Internal proxy servers |
- contoso.internalproxy1.com;contoso.internalproxy2.com |
- Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you're connecting to are enterprise resources.
This list shouldn't include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic.
If you have multiple resources, you must separate them using the ";" delimiter. |
-
- | Enterprise IPv4 Range (Required) |
- Starting IPv4 Address: 3.4.0.1
Ending IPv4 Address: 3.4.255.254
Custom URI: 3.4.0.1-3.4.255.254,
10.0.0.1-10.255.255.254 |
- Specify the addresses for a valid IPv4 value range within your intranet. These addresses, used with your Enterprise Network Domain Names, define your corporate network boundaries. If you have multiple ranges, you must separate them using the "," delimiter. |
-
-
- | Enterprise IPv6 Range |
- Starting IPv6 Address: 2a01:110::
Ending IPv6 Address: 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff
Custom URI: 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff,
fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff |
- Specify the addresses for a valid IPv6 value range within your intranet. These addresses, used with your Enterprise Network Domain Names, define your corporate network boundaries. If you have multiple ranges, you must separate them using the "," delimiter. |
-
-
- | Neutral Resources |
- sts.contoso.com,sts.contoso2.com |
- Specify your authentication redirection endpoints for your company. These locations are considered enterprise or personal, based on the context of the connection before the redirection. If you have multiple resources, you must separate them using the "," delimiter. |
-
+ - **Enterprise Cloud Resources**: Specify the cloud resources to be treated as corporate and protected by WIP.
+
+ For each cloud resource, you may also optionally specify a proxy server from your Internal proxy servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Internal proxy servers is considered enterprise.
+
+ If you have multiple resources, you must separate them using the `|` delimiter. If you don't use proxy servers, you must also include the `,` delimiter just before the `|`. For example: URL `<,proxy>|URL <,proxy>`.
+
+ **Format examples**:
+
+ - **With proxy**: `contoso.sharepoint.com,contoso.internalproxy1.com|contoso.visualstudio.com,contoso.internalproxy2.com`
+
+ - **Without proxy**: `contoso.sharepoint.com|contoso.visualstudio.com`
+
+ >[!Important]
+ > In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can't tell whether it's attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the /*AppCompat*/ string to the setting. For example: URL <,proxy>|URL <,proxy>|/*AppCompat*/.
+
+ - **Enterprise Network Domain Names (Required)**: Specify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected.
+
+ This setting works with the IP ranges settings to detect whether a network endpoint is enterprise or personal on private networks.
+
+ If you have multiple resources, you must separate them using the "," delimiter.
+
+ **Format examples**: `corp.contoso.com,region.contoso.com`
+
+ - **Proxy servers**: Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you're connecting to are enterprise resources.
+
+ This list shouldn't include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic.
+
+ If you have multiple resources, you must separate them using the ";" delimiter.
+
+ **Format examples**: `proxy.contoso.com:80;proxy2.contoso.com:443`
+
+ - **Internal proxy servers**: Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you're connecting to are enterprise resources.
+
+ This list shouldn't include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic.
+
+ If you have multiple resources, you must separate them using the ";" delimiter.
+
+ **Format examples**: `contoso.internalproxy1.com;contoso.internalproxy2.com`
+
+ - **Enterprise IPv4 Range (Required)**: Specify the addresses for a valid IPv4 value range within your intranet. These addresses, used with your Enterprise Network Domain Names, define your corporate network boundaries.
+
+ If you have multiple ranges, you must separate them using the "," delimiter.
+
+ **Format examples**:
+
+ - **Starting IPv4 Address:** `3.4.0.1`
+ - **Ending IPv4 Address:** `3.4.255.254`
+ - **Custom URI:** `3.4.0.1-3.4.255.254, 10.0.0.1-10.255.255.254`
+
+ - **Enterprise IPv6 Range**: Specify the addresses for a valid IPv6 value range within your intranet. These addresses, used with your Enterprise Network Domain Names, define your corporate network boundaries.
+
+ If you have multiple ranges, you must separate them using the "," delimiter.
+
+ **Format examples**:
+
+ - **Starting IPv6 Address:** `2a01:110::`
+ - **Ending IPv6 Address:** `2a01:110:7fff:ffff:ffff:ffff:ffff:ffff`
+ - **Custom URI:** `2a01:110:7fff:ffff:ffff:ffff:ffff:ffff,fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff`
+
+ - **Neutral Resources**: Specify your authentication redirection endpoints for your company. These locations are considered enterprise or personal, based on the context of the connection before the redirection.
+
+ If you have multiple resources, you must separate them using the "," delimiter.
+
+ **Format examples**: `sts.contoso.com,sts.contoso2.com`
3. Add as many locations as you need, and then click **OK**.
@@ -485,4 +484,4 @@ After you've created your WIP policy, you'll need to deploy it to your organizat
- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
-- [Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md)
\ No newline at end of file
+- [Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md)
diff --git a/windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md b/windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
index b483d6f902..26b8886645 100644
--- a/windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
+++ b/windows/security/information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
@@ -164,40 +164,15 @@ If you don't know the Store app publisher or product name, you can find them by
To add **Desktop apps**, complete the following fields, based on what results you want returned.
-
-
- | Field |
- Manages |
-
-
- | All fields marked as “*” |
- All files signed by any publisher. (Not recommended and may not work) |
-
-
- | Publisher only |
- If you only fill out this field, you’ll get all files signed by the named publisher.
This might be useful if your company is the publisher and signer of internal line-of-business apps. |
-
-
- | Publisher and Name only |
- If you only fill out these fields, you’ll get all files for the specified product, signed by the named publisher. |
-
-
- | Publisher, Name, and File only |
- If you only fill out these fields, you’ll get any version of the named file or package for the specified product, signed by the named publisher. |
-
-
- | Publisher, Name, File, and Min version only |
- If you only fill out these fields, you’ll get the specified version or newer releases of the named file or package for the specified product, signed by the named publisher.
This option is recommended for enlightened apps that weren't previously enlightened. |
-
-
- | Publisher, Name, File, and Max version only |
- If you only fill out these fields, you’ll get the specified version or older releases of the named file or package for the specified product, signed by the named publisher. |
-
-
- | All fields completed |
- If you fill out all fields, you’ll get the specified version of the named file or package for the specified product, signed by the named publisher. |
-
-
+|Field|Manages|
+|--- |--- |
+|All fields marked as “*”|All files signed by any publisher. (Not recommended and may not work)|
+|Publisher only|If you only fill out this field, you’ll get all files signed by the named publisher.This might be useful if your company is the publisher and signer of internal line-of-business apps.|
+|Publisher and Name only|If you only fill out these fields, you’ll get all files for the specified product, signed by the named publisher.|
+|Publisher, Name, and File only|If you only fill out these fields, you’ll get any version of the named file or package for the specified product, signed by the named publisher.|
+|Publisher, Name, File, and Min version only|If you only fill out these fields, you’ll get the specified version or newer releases of the named file or package for the specified product, signed by the named publisher.This option is recommended for enlightened apps that weren't previously enlightened.|
+|Publisher, Name, File, and Max version only|If you only fill out these fields, you’ll get the specified version or older releases of the named file or package for the specified product, signed by the named publisher.|
+|All fields completed|If you fill out all fields, you’ll get the specified version of the named file or package for the specified product, signed by the named publisher.|
To add another Desktop app, click the ellipsis **…**. After you’ve entered the info into the fields, click **OK**.
diff --git a/windows/security/information-protection/windows-information-protection/limitations-with-wip.md b/windows/security/information-protection/windows-information-protection/limitations-with-wip.md
index 8c9dcd9251..f694cd6c2c 100644
--- a/windows/security/information-protection/windows-information-protection/limitations-with-wip.md
+++ b/windows/security/information-protection/windows-information-protection/limitations-with-wip.md
@@ -22,140 +22,134 @@ ms.localizationpriority: medium
**Applies to:**
- Windows 10, version 1607 and later
-This table provides info about the most common problems you might encounter while running WIP in your organization.
+This following list provides info about the most common problems you might encounter while running WIP in your organization.
-
-
- | Limitation |
- How it appears |
- Workaround |
-
-
- | Your enterprise data on USB drives might be tied to the device it was protected on, based on your Azure RMS configuration. |
- If you’re using Azure RMS: Authenticated users can open enterprise data on USB drives, on computers running Windows 10, version 1703.
If you’re not using Azure RMS: Data in the new location remains encrypted, but becomes inaccessible on other devices and for other users. For example, the file won't open or the file opens, but doesn't contain readable text. |
- Share files with fellow employees through enterprise file servers or enterprise cloud locations. If data must be shared via USB, employees can decrypt protected files, but it will be audited.
We strongly recommend educating employees about how to limit or eliminate the need for this decryption. |
-
-
- | Direct Access is incompatible with WIP. |
- Direct Access might experience problems with how WIP enforces app behavior and data movement because of how WIP determines what is and isn’t a corporate network resource. |
- We recommend that you use VPN for client access to your intranet resources.
Note
VPN is optional and isn’t required by WIP. |
-
-
- | NetworkIsolation Group Policy setting takes precedence over MDM Policy settings. |
- The NetworkIsolation Group Policy setting can configure network settings that can also be configured by using MDM. WIP relies on these policies being correctly configured. |
- If you use both Group Policy and MDM to configure your NetworkIsolation settings, you must make sure that those same settings are deployed to your organization using both Group Policy and MDM. |
-
-
- | Cortana can potentially allow data leakage if it’s on the allowed apps list. |
- If Cortana is on the allowed list, some files might become unexpectedly encrypted after an employee performs a search using Cortana. Your employees will still be able to use Cortana to search and provide results on enterprise documents and locations, but results might be sent to Microsoft. |
- We don’t recommend adding Cortana to your allowed apps list. However, if you wish to use Cortana and don't mind whether the results potentially go to Microsoft, you can make Cortana an Exempt app. |
-
-
- | WIP is designed for use by a single user per device. |
- A secondary user on a device might experience app compatibility issues when unenlightened apps start to automatically encrypt for all users. Additionally, only the initial, enrolled user’s content can be revoked during the unenrollment process. |
- We recommend only having one user per managed device. |
-
-
- | Installers copied from an enterprise network file share might not work properly. |
- An app might fail to properly install because it can’t read a necessary configuration or data file, such as a .cab or .xml file needed for installation, which was protected by the copy action. |
- To fix this, you can:
-
- - Start the installer directly from the file share.
-OR-
- - Decrypt the locally copied files needed by the installer.
-OR-
- - Mark the file share with the installation media as “personal”. To do this, you’ll need to set the Enterprise IP ranges as Authoritative and then exclude the IP address of the file server, or you’ll need to put the file server on the Enterprise Proxy Server list.
- |
-
-
- | Changing your primary Corporate Identity isn’t supported. |
- You might experience various instabilities, including but not limited to network and file access failures, and potentially granting incorrect access. |
- Turn off WIP for all devices before changing the primary Corporate Identity (first entry in the list), restarting, and finally redeploying. |
-
-
- | Redirected folders with Client-Side Caching are not compatible with WIP. |
- Apps might encounter access errors while attempting to read a cached, offline file. |
- Migrate to use another file synchronization method, such as Work Folders or OneDrive for Business.
Note
For more info about Work Folders and Offline Files, see the blog, Work Folders and Offline Files support for Windows Information Protection. If you're having trouble opening files offline while using Offline Files and WIP, see the support article, Can't open files offline when you use Offline Files and Windows Information Protection. |
-
-
- | An unmanaged device can use Remote Desktop Protocol (RDP) to connect to a WIP-managed device. |
- Data copied from the WIP-managed device is marked as Work. Data copied to the WIP-managed device is not marked as Work. Local Work data copied to the WIP-managed device remains Work data. Work data that is copied between two apps in the same session remains data. |
- Disable RDP to prevent access because there is no way to restrict access to only devices managed by WIP. RDP is disabled by default. |
-
-
- | You can't upload an enterprise file to a personal location using Microsoft Edge or Internet Explorer. |
- A message appears stating that the content is marked as Work and the user isn't given an option to override to Personal. |
- Open File Explorer and change the file ownership to Personal before you upload. |
-
-
- | ActiveX controls should be used with caution. |
- Webpages that use ActiveX controls can potentially communicate with other outside processes that aren’t protected by using WIP. |
- We recommend that you switch to using Microsoft Edge, the more secure and safer browser that prevents the use of ActiveX controls. We also recommend that you limit the usage of Internet Explorer 11 to only those line-of-business apps that require legacy technology.
For more info, see Out-of-date ActiveX control blocking. |
-
-
- | Resilient File System (ReFS) isn't currently supported with WIP. |
- Trying to save or transfer WIP files to ReFS will fail. |
- Format drive for NTFS, or use a different drive. |
-
-
- WIP isn’t turned on if any of the following folders have the MakeFolderAvailableOfflineDisabled option set to False:
-
- - AppDataRoaming
- - Desktop
- - StartMenu
- - Documents
- - Pictures
- - Music
- - Videos
- - Favorites
- - Contacts
- - Downloads
- - Links
- - Searches
- - SavedGames
-
- |
- WIP isn’t turned on for employees in your organization. Error code 0x807c0008 will result if WIP is deployed by using Microsoft Endpoint Configuration Manager. |
- Don’t set the MakeFolderAvailableOfflineDisabled option to False for any of the specified folders. You can configure this parameter, as described here.
If you currently use redirected folders, we recommend that you migrate to a file synchronization solution that supports WIP, such as Work Folders or OneDrive for Business. Additionally, if you apply redirected folders after WIP is already in place, you might be unable to open your files offline. For more info about these potential access errors, see Can't open files offline when you use Offline Files and Windows Information Protection.
- |
-
-
- | Only enlightened apps can be managed without device enrollment
- |
- If a user enrolls a device for Mobile Application Management (MAM) without device enrollment, only enlightened apps will be managed. This is by design to prevent personal files from being unintentionally encrypted by unenlighted apps. Unenlighted apps that need to access work using MAM need to be re-compiled as LOB apps or managed by using MDM with device enrollment. |
- If all apps need to be managed, enroll the device for MDM.
- |
-
-
- By design, files in the Windows directory (%windir% or C:/Windows) cannot be encrypted because they need to be accessed by any user. If a file in the Windows directory gets encrypted by one user, other users can't access it.
|
- Any attempt to encrypt a file in the Windows directory will return a file access denied error. But if you copy or drag and drop an encrypted file to the Windows directory, it will retain encryption to honor the intent of the owner.
- |
- If you need to save an encrypted file in the Windows directory, create and encrypt the file in a different directory and copy it.
- |
-
-
- | OneNote notebooks on OneDrive for Business must be properly configured to work with WIP. |
- OneNote might encounter errors syncing a OneDrive for Business notebook and suggest changing the file ownership to Personal. Attempting to view the notebook in OneNote Online in the browser will show an error and unable to view it. |
- "OneNote notebooks that are newly copied into the OneDrive for Business folder from File Explorer should get fixed automatically. To do this, follow these steps:
-1. Close the notebook in OneNote.
-2. Move the notebook folder via File Explorer out of the OneDrive for Business folder to another location, such as the Desktop.
-3. Copy the notebook folder and Paste it back into the OneDrive for Business folder.
+- **Limitation**: Your enterprise data on USB drives might be tied to the device it was protected on, based on your Azure RMS configuration.
+ - **How it appears**:
+ - If you’re using Azure RMS: Authenticated users can open enterprise data on USB drives, on computers running Windows 10, version 1703.
+ - If you’re not using Azure RMS: Data in the new location remains encrypted, but becomes inaccessible on other devices and for other users. For example, the file won't open or the file opens, but doesn't contain readable text.
-Wait a few minutes to allow OneDrive to finish syncing & upgrading the notebook, and the folder should automatically convert to an Internet Shortcut. Opening the shortcut will open the notebook in the browser, which can then be opened in the OneNote client by using the “Open in app” button. |
-
-
- | Microsoft Office Outlook offline data files (PST and OST files) are not marked as Work files, and are therefore not protected.
- |
- If Microsoft Office Outlook is set to work in cached mode (default setting), or if some emails are stored in a local PST file, the data is unprotected.
- |
- It is recommended to use Microsoft Office Outlook in Online mode, or to use encryption to protect OST and PST files manually.
- |
-
-
+ - **Workaround**: Share files with fellow employees through enterprise file servers or enterprise cloud locations. If data must be shared via USB, employees can decrypt protected files, but it will be audited.
+
+ We strongly recommend educating employees about how to limit or eliminate the need for this decryption.
+
+- **Limitation**: Direct Access is incompatible with WIP.
+ - **How it appears**: Direct Access might experience problems with how WIP enforces app behavior and data movement because of how WIP determines what is and isn’t a corporate network resource.
+ - **Workaround**: We recommend that you use VPN for client access to your intranet resources.
+
+ > [!NOTE]
+ > VPN is optional and isn’t required by WIP.
+
+- **Limitation**: **NetworkIsolation** Group Policy setting takes precedence over MDM Policy settings.
+ - **How it appears**: The **NetworkIsolation** Group Policy setting can configure network settings that can also be configured by using MDM. WIP relies on these policies being correctly configured.
+ - **Workaround**: If you use both Group Policy and MDM to configure your **NetworkIsolation** settings, you must make sure that those same settings are deployed to your organization using both Group Policy and MDM.
+
+- **Limitation**: Cortana can potentially allow data leakage if it’s on the allowed apps list.
+ - **How it appears**: If Cortana is on the allowed list, some files might become unexpectedly encrypted after an employee performs a search using Cortana. Your employees will still be able to use Cortana to search and provide results on enterprise documents and locations, but results might be sent to Microsoft.
+ - **Workaround**: We don’t recommend adding Cortana to your allowed apps list. However, if you wish to use Cortana and don't mind whether the results potentially go to Microsoft, you can make Cortana an Exempt app.
+
+- **Limitation**: WIP is designed for use by a single user per device.
+ - **How it appears**: A secondary user on a device might experience app compatibility issues when unenlightened apps start to automatically encrypt for all users. Additionally, only the initial, enrolled user’s content can be revoked during the unenrollment process.
+ - **Workaround**: We recommend only having one user per managed device.
+
+- **Limitation**: Installers copied from an enterprise network file share might not work properly.
+ - **How it appears**: An app might fail to properly install because it can’t read a necessary configuration or data file, such as a .cab or .xml file needed for installation, which was protected by the copy action.
+ - **Workaround**: To fix this, you can:
+ - Start the installer directly from the file share.
+
+ OR
+
+ - Decrypt the locally copied files needed by the installer.
+
+ OR
+
+ - Mark the file share with the installation media as “personal”. To do this, you’ll need to set the Enterprise IP ranges as **Authoritative** and then exclude the IP address of the file server, or you’ll need to put the file server on the Enterprise Proxy Server list.
+
+- **Limitation**: Changing your primary Corporate Identity isn’t supported.
+ - **How it appears**: You might experience various instabilities, including but not limited to network and file access failures, and potentially granting incorrect access.
+ - **Workaround**: Turn off WIP for all devices before changing the primary Corporate Identity (first entry in the list), restarting, and finally redeploying.
+
+- **Limitation**: Redirected folders with Client-Side Caching are not compatible with WIP.
+ - **How it appears**: Apps might encounter access errors while attempting to read a cached, offline file.
+ - **Workaround**: Migrate to use another file synchronization method, such as Work Folders or OneDrive for Business.
+
+ > [!NOTE]
+ > For more info about Work Folders and Offline Files, see the [Work Folders and Offline Files support for Windows Information Protection blog](https://blogs.technet.microsoft.com/filecab/2016/08/29/work-folders-and-offline-files-support-for-windows-information-protection/)". If you're having trouble opening files offline while using Offline Files and WIP, see [Can't open files offline when you use Offline Files and Windows Information Protection](/troubleshoot/windows-client/networking/error-open-files-offline-offline-files-wip).
+
+- **Limitation**: An unmanaged device can use Remote Desktop Protocol (RDP) to connect to a WIP-managed device.
+ - **How it appears**:
+ - Data copied from the WIP-managed device is marked as **Work**.
+ - Data copied to the WIP-managed device is not marked as **Work**.
+ - Local **Work** data copied to the WIP-managed device remains **Work** data.
+ - **Work** data that is copied between two apps in the same session remains ** data.
+
+ - **Workaround**: Disable RDP to prevent access because there is no way to restrict access to only devices managed by WIP. RDP is disabled by default.
+
+- **Limitation**: You can't upload an enterprise file to a personal location using Microsoft Edge or Internet Explorer.
+ - **How it appears**: A message appears stating that the content is marked as **Work** and the user isn't given an option to override to **Personal**.
+ - **Workaround**: Open File Explorer and change the file ownership to **Personal** before you upload.
+
+- **Limitation**: ActiveX controls should be used with caution.
+ - **How it appears**: Webpages that use ActiveX controls can potentially communicate with other outside processes that aren’t protected by using WIP.
+ - **Workaround**: We recommend that you switch to using Microsoft Edge, the more secure and safer browser that prevents the use of ActiveX controls. We also recommend that you limit the usage of Internet Explorer 11 to only those line-of-business apps that require legacy technology.
+
+ For more info, see [Out-of-date ActiveX control blocking](/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking).
+
+- **Limitation**: Resilient File System (ReFS) isn't currently supported with WIP.
+ - **How it appears**:Trying to save or transfer WIP files to ReFS will fail.
+ - **Workaround**: Format drive for NTFS, or use a different drive.
+
+- **Limitation**: WIP isn’t turned on if any of the following folders have the **MakeFolderAvailableOfflineDisabled** option set to **False**:
+ - AppDataRoaming
+ - Desktop
+ - StartMenu
+ - Documents
+ - Pictures
+ - Music
+ - Videos
+ - Favorites
+ - Contacts
+ - Downloads
+ - Links
+ - Searches
+ - SavedGames
+
+
+
+ - **How it appears**: WIP isn’t turned on for employees in your organization. Error code 0x807c0008 will result if WIP is deployed by using Microsoft Endpoint Configuration Manager.
+ - **Workaround**: Don’t set the **MakeFolderAvailableOfflineDisabled** option to **False** for any of the specified folders. You can configure this parameter, as described [here](/windows-server/storage/folder-redirection/disable-offline-files-on-folders)".
+
+ If you currently use redirected folders, we recommend that you migrate to a file synchronization solution that supports WIP, such as Work Folders or OneDrive for Business. Additionally, if you apply redirected folders after WIP is already in place, you might be unable to open your files offline.
+
+ For more info about these potential access errors, see [Can't open files offline when you use Offline Files and Windows Information Protection](/troubleshoot/windows-client/networking/error-open-files-offline-offline-files-wip).
+
+- **Limitation**: Only enlightened apps can be managed without device enrollment
+ - **How it appears**: If a user enrolls a device for Mobile Application Management (MAM) without device enrollment, only enlightened apps will be managed. This is by design to prevent personal files from being unintentionally encrypted by unenlighted apps.
+
+ Unenlighted apps that need to access work using MAM need to be re-compiled as LOB apps or managed by using MDM with device enrollment.
+
+ - **Workaround**: If all apps need to be managed, enroll the device for MDM.
+
+- **Limitation**: By design, files in the Windows directory (%windir% or C:/Windows) cannot be encrypted because they need to be accessed by any user. If a file in the Windows directory gets encrypted by one user, other users can't access it.
+ - **How it appears**: Any attempt to encrypt a file in the Windows directory will return a file access denied error. But if you copy or drag and drop an encrypted file to the Windows directory, it will retain encryption to honor the intent of the owner.
+ - **Workaround**: If you need to save an encrypted file in the Windows directory, create and encrypt the file in a different directory and copy it.
+
+- **Limitation**: OneNote notebooks on OneDrive for Business must be properly configured to work with WIP.
+ - **How it appears**: OneNote might encounter errors syncing a OneDrive for Business notebook and suggest changing the file ownership to Personal. Attempting to view the notebook in OneNote Online in the browser will show an error and unable to view it.
+ - **Workaround**: OneNote notebooks that are newly copied into the OneDrive for Business folder from File Explorer should get fixed automatically. To do this, follow these steps:
+
+ 1. Close the notebook in OneNote.
+ 2. Move the notebook folder via File Explorer out of the OneDrive for Business folder to another location, such as the Desktop.
+ 3. Copy the notebook folder and Paste it back into the OneDrive for Business folder.
+
+ Wait a few minutes to allow OneDrive to finish syncing & upgrading the notebook, and the folder should automatically convert to an Internet Shortcut. Opening the shortcut will open the notebook in the browser, which can then be opened in the OneNote client by using the “Open in app” button.
+
+- **Limitation**: Microsoft Office Outlook offline data files (PST and OST files) are not marked as **Work** files, and are therefore not protected.
+ - **How it appears**: If Microsoft Office Outlook is set to work in cached mode (default setting), or if some emails are stored in a local PST file, the data is unprotected.
+ - **Workaround**: It is recommended to use Microsoft Office Outlook in Online mode, or to use encryption to protect OST and PST files manually.
> [!NOTE]
-> When corporate data is written to disk, WIP uses the Windows-provided Encrypting File System (EFS) to protect it and associate it with your enterprise identity. One caveat to keep in mind is that the Preview Pane in File Explorer will not work for encrypted files.
-
-
-
-
-> [!NOTE]
-> Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to our content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
+>
+> - When corporate data is written to disk, WIP uses the Windows-provided Encrypting File System (EFS) to protect it and associate it with your enterprise identity. One caveat to keep in mind is that the Preview Pane in File Explorer will not work for encrypted files.
+>
+> - Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to our content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
diff --git a/windows/security/information-protection/windows-information-protection/testing-scenarios-for-wip.md b/windows/security/information-protection/windows-information-protection/testing-scenarios-for-wip.md
index b0877c16e0..247a47ecf5 100644
--- a/windows/security/information-protection/windows-information-protection/testing-scenarios-for-wip.md
+++ b/windows/security/information-protection/windows-information-protection/testing-scenarios-for-wip.md
@@ -31,141 +31,128 @@ You can try any of the processes included in these scenarios, but you should foc
>[!IMPORTANT]
>If any of these scenarios does not work, first take note of whether WIP has been revoked. If it has, unenlightened apps will have to be uninstalled and re-installed since their settings files will remain encrypted.
-
-
- | Scenario |
- Processes |
-
-
- | Encrypt and decrypt files using File Explorer. |
- For desktop:
-
- - Open File Explorer, right-click a work document, and then click Work from the File Ownership menu.
Make sure the file is encrypted by right-clicking the file again, clicking Advanced from the General tab, and then clicking Details from the Compress or Encrypt attributes area. The file should show up under the heading, This enterprise domain can remove or revoke access: <your_enterprise_identity>. For example, contoso.com.
- - In File Explorer, right-click the same document, and then click Personal from the File Ownership menu.
Make sure the file is decrypted by right-clicking the file again, clicking Advanced from the General tab, and then verifying that the Details button is unavailable.
-
- For mobile:
-
- - Open the File Explorer app, browse to a file location, click the elipsis (...), and then click Select to mark at least one file as work-related.
- - Click the elipsis (...) again, click File ownership from the drop down menu, and then click Work.
Make sure the file is encrypted, by locating the Briefcase icon next to the file name.
- - Select the same file, click File ownership from the drop down menu, and then click Personal.
Make sure the file is decrypted and that you're no longer seeing the Briefcase icon next to file name.
-
- |
-
-
- | Create work documents in enterprise-allowed apps. |
- For desktop:
-
- For mobile:
-
- - Start an allowed mobile app, such as Word Mobile, create a new document, and then save your changes as Work to a local, work-related location.
Make sure the document is encrypted, by locating the Briefcase icon next to the file name.
- - Open the same document and attempt to save it to a non-work-related location.
WIP should stop you from saving the file to this location.
- - Open the same document one last time, make a change to the contents, and then save it again using the Personal option.
Make sure the file is decrypted and that you're no longer seeing the Briefcase icon next to file name.
-
- |
-
- | Block enterprise data from non-enterprise apps. |
-
-
- - Start an app that doesn't appear on your allowed apps list, and then try to open a work-encrypted file.
The app shouldn't be able to access the file.
- - Try double-clicking or tapping on the work-encrypted file.
If your default app association is an app not on your allowed apps list, you should get an Access Denied error message.
-
- |
-
-
- | Copy and paste from enterprise apps to non-enterprise apps. |
-
-
- - Copy (CTRL+C) content from an app on your allowed apps list, and then try to paste (CTRL+V) the content into an app that doesn't appear on your allowed apps list.
You should see a WIP-related warning box, asking you to click either Change to personal or Keep at work.
- - Click Keep at work.
The content isn't pasted into the non-enterprise app.
- - Repeat Step 1, but this time click Change to personal, and try to paste the content again.
The content is pasted into the non-enterprise app.
- - Try copying and pasting content between apps on your allowed apps list.
The content should copy and paste between apps without any warning messages.
-
- |
-
-
- | Drag and drop from enterprise apps to non-enterprise apps. |
-
-
- - Drag content from an app on your allowed apps list, and then try to drop the content into an app that doesn't appear on your allowed apps list.
You should see a WIP-related warning box, asking you to click either Keep at work or Change to personal.
- - Click Keep at work.
The content isn't dropped into the non-enterprise app.
- - Repeat Step 1, but this time click Change to personal, and try to drop the content again.
The content is dropped into the non-enterprise app.
- - Try dragging and dropping content between apps on your allowed apps list.
The content should move between the apps without any warning messages.
-
- |
-
-
- | Share between enterprise apps and non-enterprise apps. |
-
-
- - Open an app on your allowed apps list, like Microsoft Photos, and try to share content with an app that doesn't appear on your allowed apps list, like Facebook.
You should see a WIP-related warning box, asking you to click either Keep at work or Change to personal.
- - Click Keep at work.
The content isn't shared into Facebook.
- - Repeat Step 1, but this time click Change to personal, and try to share the content again.
The content is shared into Facebook.
- - Try sharing content between apps on your allowed apps list.
The content should share between the apps without any warning messages.
-
- |
-
-
- | Verify that Windows system components can use WIP. |
-
-
- - Start Windows Journal and Internet Explorer 11, creating, editing, and saving files in both apps.
Make sure that all of the files you worked with are encrypted to your configured Enterprise Identity. In some cases, you might need to close the file and wait a few moments for it to be automatically encrypted.
- - Open File Explorer and make sure your modified files are appearing with a Lock icon.
- - Try copying and pasting, dragging and dropping, and sharing using these apps with other apps that appear both on and off the allowed apps list.
Note
Most Windows-signed components like File Explorer (when running in the user's context), should have access to enterprise data.
A few notable exceptions include some of the user-facing in-box apps, like Wordpad, Notepad, and Microsoft Paint. These apps don't have access by default, but can be added to your allowed apps list.
-
- |
-
-
- | Use WIP on NTFS, FAT, and exFAT systems. |
-
-
- - Start an app that uses the FAT or exFAT file system (for example a SD card or USB flash drive), and appears on your allowed apps list.
- - Create, edit, write, save, copy, and move files.
Basic file and folder operations like copy, move, rename, delete, and so on, should work properly on encrypted files.
-
- |
-
-
- | Verify your shared files can use WIP. |
-
-
- - Download a file from a protected file share, making sure the file is encrypted by locating the Briefcase icon next to the file name.
- - Open the same file, make a change, save it and then try to upload it back to the file share. Again, this should work without any warnings.
- - Open an app that doesn't appear on your allowed apps list and attempt to access a file on the WIP-enabled file share.
The app shouldn't be able to access the file share.
-
- |
-
-
- | Verify your cloud resources can use WIP. |
-
-
- - Add both Internet Explorer 11 and Microsoft Edge to your allowed apps list.
- - Open SharePoint (or another cloud resource that's part of your policy) and access a WIP-enabled resource by using both IE11 and Microsoft Edge.
Both browsers should respect the enterprise and personal boundary.
- - Remove Internet Explorer 11 from your allowed app list and then try to access an intranet site or enterprise-related cloud resource.
IE11 shouldn't be able to access the sites.
Note
Any file downloaded from your work SharePoint site, or any other WIP-enabled cloud resource, is automatically marked as Work.
-
- |
-
-
- | Verify your Virtual Private Network (VPN) can be auto-triggered. |
-
-
- - Set up your VPN network to start based on the WIPModeID setting.
For specific info about how to do this, see the Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune topic.
- - Start an app from your allowed apps list.
The VPN network should automatically start.
- - Disconnect from your network and then start an app that isn't on your allowed apps list.
The VPN shouldn't start and the app shouldn't be able to access your enterprise network.
-
- |
-
-
- | Unenroll client devices from WIP. |
-
-
- - Unenroll a device from WIP by going to Settings, click Accounts, click Work, click the name of the device you want to unenroll, and then click Remove.
The device should be removed and all of the enterprise content for that managed account should be gone.
Important
On desktop devices, the data isn't removed and can be recovered, so you must make sure the content is marked as Revoked and that access is denied for the employee. On mobile devices, the data is removed.
-
- |
-
-
-
-
+- **Encrypt and decrypt files using File Explorer**:
+
+ 1. Open File Explorer, right-click a work document, and then click **Work** from the **File Ownership** menu.
+
+ Make sure the file is encrypted by right-clicking the file again, clicking **Advanced** from the **General** tab, and then clicking **Details** from the **Compress or Encrypt attributes** area. The file should show up under the heading, **This enterprise domain can remove or revoke access:** `**`. For example, `contoso.com`.
+
+ 2. In File Explorer, right-click the same document, and then click **Personal** from the **File Ownership** menu.
+
+ Make sure the file is decrypted by right-clicking the file again, clicking **Advanced** from the **General** tab, and then verifying that the **Details** button is unavailable.
+
+- **Create work documents in enterprise-allowed apps**: Start an unenlightened but allowed app, such as a line-of-business app, and then create a new document, saving your changes.
+
+ Make sure the document is encrypted to your Enterprise Identity. This might take a few minutes and require you to close and re-open the file.
+
+ > [!IMPORTANT]
+ > Certain file types like `.exe` and `.dll`, along with certain file paths, such as `%windir%` and `%programfiles%` are excluded from automatic encryption.
+
+ For more info about your Enterprise Identity and adding apps to your allowed apps list, see either [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune-azure.md) or [Create a Windows Information Protection (WIP) policy using Microsoft Endpoint Configuration Manager](create-wip-policy-using-configmgr.md), based on your deployment system.
+
+- **Block enterprise data from non-enterprise apps**:
+
+ 1. Start an app that doesn't appear on your allowed apps list, and then try to open a work-encrypted file.
+
+ The app shouldn't be able to access the file.
+
+ 2. Try double-clicking or tapping on the work-encrypted file. If your default app association is an app not on your allowed apps list, you should get an **Access Denied** error message.
+
+- **Copy and paste from enterprise apps to non-enterprise apps**:
+
+ 1. Copy (CTRL+C) content from an app on your allowed apps list, and then try to paste (CTRL+V) the content into an app that doesn't appear on your allowed apps list.
+
+ You should see a WIP-related warning box, asking you to click either **Change to personal** or **Keep at work**.
+
+ 2. Click **Keep at work**. The content isn't pasted into the non-enterprise app.
+ 3. Repeat Step 1, but this time click **Change to personal**, and try to paste the content again.
+
+ The content is pasted into the non-enterprise app.
+
+ 4. Try copying and pasting content between apps on your allowed apps list. The content should copy and paste between apps without any warning messages.
+
+- **Drag and drop from enterprise apps to non-enterprise apps**:
+
+ 1. Drag content from an app on your allowed apps list, and then try to drop the content into an app that doesn't appear on your allowed apps list.
+
+ You should see a WIP-related warning box, asking you to click either **Keep at work** or **Change to personal**.
+
+ 2. Click **Keep at work**. The content isn't dropped into the non-enterprise app.
+ 3. Repeat Step 1, but this time click **Change to personal**, and try to drop the content again.
+
+ The content is dropped into the non-enterprise app.
+
+ 4. Try dragging and dropping content between apps on your allowed apps list. The content should move between the apps without any warning messages.
+
+- **Share between enterprise apps and non-enterprise apps**:
+
+ 1. Open an app on your allowed apps list, like Microsoft Photos, and try to share content with an app that doesn't appear on your allowed apps list, like Facebook.
+
+ You should see a WIP-related warning box, asking you to click either **Keep at work** or **Change to personal**.
+
+ 2. Click **Keep at work**. The content isn't shared into Facebook.
+ 3. Repeat Step 1, but this time click **Change to personal**, and try to share the content again.
+
+ The content is shared into Facebook.
+
+ 4. Try sharing content between apps on your allowed apps list. The content should share between the apps without any warning messages.
+
+- **Verify that Windows system components can use WIP**:
+
+ 1. Start Windows Journal and Internet Explorer 11, creating, editing, and saving files in both apps.
+
+ Make sure that all of the files you worked with are encrypted to your configured Enterprise Identity. In some cases, you might need to close the file and wait a few moments for it to be automatically encrypted.
+
+ 2. Open File Explorer and make sure your modified files are appearing with a **Lock** icon.
+ 3. Try copying and pasting, dragging and dropping, and sharing using these apps with other apps that appear both on and off the allowed apps list.
+
+ > [!NOTE]
+ > Most Windows-signed components like File Explorer (when running in the user's context), should have access to enterprise data.
+ >
+ > A few notable exceptions include some of the user-facing in-box apps, like Wordpad, Notepad, and Microsoft Paint. These apps don't have access by default, but can be added to your allowed apps list.
+
+- **Use WIP on NTFS, FAT, and exFAT systems**:
+
+ 1. Start an app that uses the FAT or exFAT file system (for example a SD card or USB flash drive), and appears on your allowed apps list.
+ 2. Create, edit, write, save, copy, and move files. Basic file and folder operations like copy, move, rename, delete, and so on, should work properly on encrypted files.
+
+- **Verify your shared files can use WIP**:
+
+ 1. Download a file from a protected file share, making sure the file is encrypted by locating the **Briefcase** icon next to the file name.
+ 2. Open the same file, make a change, save it and then try to upload it back to the file share. Again, this should work without any warnings.
+ 3. Open an app that doesn't appear on your allowed apps list and attempt to access a file on the WIP-enabled file share.
+
+ The app shouldn't be able to access the file share.
+
+- **Verify your cloud resources can use WIP**:
+
+ 1. Add both Internet Explorer 11 and Microsoft Edge to your allowed apps list.
+ 2. Open SharePoint (or another cloud resource that's part of your policy) and access a WIP-enabled resource by using both IE11 and Microsoft Edge.
+
+ Both browsers should respect the enterprise and personal boundary.
+
+ 3. Remove Internet Explorer 11 from your allowed app list and then try to access an intranet site or enterprise-related cloud resource.
+
+ IE11 shouldn't be able to access the sites.
+
+ > [!NOTE]
+ > Any file downloaded from your work SharePoint site, or any other WIP-enabled cloud resource, is automatically marked as **Work**.
+
+- **Verify your Virtual Private Network (VPN) can be auto-triggered**:
+
+ 1. Set up your VPN network to start based on the **WIPModeID** setting. For specific info, see [Create and deploy a VPN policy for Windows Information Protection (WIP) using Microsoft Intune](create-vpn-and-wip-policy-using-intune-azure.md).
+ 2. Start an app from your allowed apps list. The VPN network should automatically start.
+ 3. Disconnect from your network and then start an app that isn't on your allowed apps list.
+
+ The VPN shouldn't start and the app shouldn't be able to access your enterprise network.
+
+- **Unenroll client devices from WIP**: Unenroll a device from WIP by going to **Settings**, click **Accounts**, click **Work**, click the name of the device you want to unenroll, and then click **Remove**.
+
+ The device should be removed and all of the enterprise content for that managed account should be gone.
+
+ > [!IMPORTANT]
+ > On client devices, the data isn't removed and can be recovered. So, you must make sure the content is marked as **Revoked** and that access is denied for the employee.
+
>[!NOTE]
->Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Editing Windows IT professional documentation](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
+>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute, see [Editing Windows IT professional documentation](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md
index 7cf2f166da..c76ead4afc 100644
--- a/windows/security/threat-protection/index.md
+++ b/windows/security/threat-protection/index.md
@@ -29,18 +29,18 @@ In Windows client, hardware and software work together to help protect you from
See the following articles to learn more about the different areas of Windows threat protection:
-- [Application Control](/windows-defender-application-control/windows-defender-application-control.md)
+- [Application Control](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control)
- [Attack Surface Reduction Rules](/microsoft-365/security/defender-endpoint/attack-surface-reduction)
- [Controlled Folder Access](/microsoft-365/security/defender-endpoint/controlled-folders)
- [Exploit Protection](/microsoft-365/security/defender-endpoint/exploit-protection)
-- [Microsoft Defender Application Guard](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md)
+- [Microsoft Defender Application Guard](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview)
- [Microsoft Defender Device Guard](device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md)
-- [Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md)
+- [Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview)
- [Network Protection](/microsoft-365/security/defender-endpoint/network-protection)
-- [Virtualization-Based Protection of Code Integrity](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md)
+- [Virtualization-Based Protection of Code Integrity](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity)
- [Web Protection](/microsoft-365/security/defender-endpoint/web-protection-overview)
- [Windows Firewall](windows-firewall/windows-firewall-with-advanced-security.md)
-- [Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md)
+- [Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview)
### Next-generation protection
Next-generation protection is designed to identify and block new and emerging threats. Powered by the cloud and machine learning, Microsoft Defender Antivirus can help stop attacks in real-time.
diff --git a/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings.md b/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings.md
index 14c78b9fa8..39945ec254 100644
--- a/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings.md
+++ b/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings.md
@@ -26,195 +26,56 @@ See [Windows 10 (and Windows 11) settings to protect devices using Intune](/intu
## Group Policy settings
SmartScreen uses registry-based Administrative Template policy settings.
-
-
-| Setting |
-Supported on |
-Description |
-
-
-Windows 10, version 2004:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure Windows Defender SmartScreen
- | Windows 10, version 1703:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure Windows Defender SmartScreenWindows 10, Version 1607 and earlier:
Administrative Templates\Windows Components\File Explorer\Configure Windows SmartScreen
-At least Windows Server 2012, Windows 8 or Windows RT |
-This policy setting turns on Microsoft Defender SmartScreen. If you enable this setting, it turns on Microsoft Defender SmartScreen and your employees are unable to turn it off. Additionally, when enabling this feature, you must also pick whether Microsoft Defender SmartScreen should Warn your employees or Warn and prevent bypassing the message (effectively blocking the employee from the site). If you disable this setting, it turns off Microsoft Defender SmartScreen and your employees are unable to turn it on. If you don't configure this setting, your employees can decide whether to use Microsoft Defender SmartScreen. |
-
-
-Windows 10, version 2004:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure App Install Control |
-Windows 10, version 1703:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure App Install Control |
-This policy setting is intended to prevent malicious content from affecting your user's devices when downloading executable content from the internet. This setting does not protect against malicious content from USB devices, network shares, or other non-internet sources. Important: Using a trustworthy browser helps ensure that these protections work as expected. |
-
-
-Windows 10, version 2004:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Configure Windows Defender SmartScreen (Microsoft Edge version 45 and earlier)Administrative Templates\Microsoft Edge\SmartScreen settings\Configure Microsoft Defender SmartScreen (Microsoft Edge version 77 or later) Windows 10, version 1703:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Configure Windows Defender SmartScreen (Microsoft Edge version 45 and earlier) Administrative Templates\Microsoft Edge\SmartScreen settings\Configure Microsoft Defender SmartScreen (Microsoft Edge version 77 or later) Windows 10, Version 1607 and earlier:
Administrative Templates\Windows Components\Microsoft Edge\Configure Windows SmartScreen |
-Microsoft Edge on Windows 10 or Windows 11 |
-This policy setting turns on Microsoft Defender SmartScreen. If you enable this setting, it turns on Microsoft Defender SmartScreen and your employees are unable to turn it off. If you disable this setting, it turns off Microsoft Defender SmartScreen and your employees are unable to turn it on. If you don't configure this setting, your employees can decide whether to use Microsoft Defender SmartScreen. |
-
-
-Windows 10, version 2004:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files (Microsoft Edge version 45 and earlier)Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing of Microsoft Defender SmartScreen warnings about downloads (Microsoft Edge version 77 or later) Windows 10, version 1703:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files (Microsoft Edge version 45 and earlier) Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing of Microsoft Defender SmartScreen warnings about downloads (Microsoft Edge version 77 or later) Windows 10, Version 1511 and 1607:
Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows SmartScreen prompts for files |
-Microsoft Edge on Windows 10, version 1511 or later |
-This policy setting stops employees from bypassing the Microsoft Defender SmartScreen warnings about potentially malicious files. If you enable this setting, it stops employees from bypassing the warning, stopping the file download. If you disable or don't configure this setting, your employees can bypass the warnings and continue to download potentially malicious files. |
-
-
-Windows 10, version 2004:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 45 and earlier)Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing Microsoft Defender SmartScreen prompts for sites (Microsoft Edge version 77 or later) Windows 10, version 1703:
Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 45 and earlier) Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing Microsoft Defender SmartScreen prompts for sites (Microsoft Edge version 77 or later) Windows 10, Version 1511 and 1607:
Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows SmartScreen prompts for sites |
-Microsoft Edge on Windows 10, version 1511 or later |
-This policy setting stops employees from bypassing the Microsoft Defender SmartScreen warnings about potentially malicious sites. If you enable this setting, it stops employees from bypassing the warning, stopping them from going to the site. If you disable or don't configure this setting, your employees can bypass the warnings and continue to visit a potentially malicious site. |
-
-
-| Administrative Templates\Windows Components\Internet Explorer\Prevent managing SmartScreen Filter |
-Internet Explorer 9 or later |
-This policy setting prevents the employee from managing Microsoft Defender SmartScreen. If you enable this policy setting, the employee isn't prompted to turn on Microsoft Defender SmartScreen. All website addresses that are not on the filter's allow list are sent automatically to Microsoft without prompting the employee. If you disable or don't configure this policy setting, the employee is prompted to decide whether to turn on Microsoft Defender SmartScreen during the first-run experience. |
-
-
-| Administrative Templates\Windows Components\Internet Explorer\Prevent bypassing SmartScreen Filter warnings |
-Internet Explorer 8 or later |
-This policy setting determines whether an employee can bypass warnings from Microsoft Defender SmartScreen. If you enable this policy setting, Microsoft Defender SmartScreen warnings block the employee. If you disable or don't configure this policy setting, the employee can bypass Microsoft Defender SmartScreen warnings. |
-
-
-| Administrative Templates\Windows Components\Internet Explorer\Prevent bypassing SmartScreen Filter warnings about files that are not commonly downloaded from the Internet |
-Internet Explorer 9 or later |
-This policy setting determines whether the employee can bypass warnings from Microsoft Defender SmartScreen. Microsoft Defender SmartScreen warns the employee about executable files that Internet Explorer users do not commonly download from the Internet. If you enable this policy setting, Microsoft Defender SmartScreen warnings block the employee. If you disable or don't configure this policy setting, the employee can bypass Microsoft Defender SmartScreen warnings. |
-
-
+
+Setting|Supported on|Description|
+|--- |--- |--- |
+|**Windows 10, version 2004:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure Windows Defender SmartScreen|**Windows 10, version 1703:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure Windows Defender SmartScreen
**Windows 10, Version 1607 and earlier:** Administrative Templates\Windows Components\File Explorer\Configure Windows SmartScreen
**At least Windows Server 2012, Windows 8 or Windows RT**|This policy setting turns on Microsoft Defender SmartScreen.
If you enable this setting, it turns on Microsoft Defender SmartScreen and your employees are unable to turn it off. Additionally, when enabling this feature, you must also pick whether Microsoft Defender SmartScreen should Warn your employees or Warn and prevent bypassing the message (effectively blocking the employee from the site).
If you disable this setting, it turns off Microsoft Defender SmartScreen and your employees are unable to turn it on.
If you don't configure this setting, your employees can decide whether to use Microsoft Defender SmartScreen.|
+|**Windows 10, version 2004:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure App Install Control|**Windows 10, version 1703:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Explorer\Configure App Install Control|This policy setting is intended to prevent malicious content from affecting your user's devices when downloading executable content from the internet.
This setting does not protect against malicious content from USB devices, network shares, or other non-internet sources.
**Important:** Using a trustworthy browser helps ensure that these protections work as expected.|
+|**Windows 10, version 2004:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Configure Windows Defender SmartScreen (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Configure Microsoft Defender SmartScreen (Microsoft Edge version 77 or later)
**Windows 10, version 1703:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Configure Windows Defender SmartScreen (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Configure Microsoft Defender SmartScreen (Microsoft Edge version 77 or later)
**Windows 10, Version 1607 and earlier:** Administrative Templates\Windows Components\Microsoft Edge\Configure Windows SmartScreen|Microsoft Edge on Windows 10 or Windows 11|This policy setting turns on Microsoft Defender SmartScreen.
If you enable this setting, it turns on Microsoft Defender SmartScreen and your employees are unable to turn it off.
If you disable this setting, it turns off Microsoft Defender SmartScreen and your employees are unable to turn it on.
If you don't configure this setting, your employees can decide whether to use Microsoft Defender SmartScreen.|
+|**Windows 10, version 2004:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing of Microsoft Defender SmartScreen warnings about downloads (Microsoft Edge version 77 or later)
**Windows 10, version 1703:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing of Microsoft Defender SmartScreen warnings about downloads (Microsoft Edge version 77 or later)
**Windows 10, Version 1511 and 1607:** Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows SmartScreen prompts for files|Microsoft Edge on Windows 10, version 1511 or later|This policy setting stops employees from bypassing the Microsoft Defender SmartScreen warnings about potentially malicious files.
If you enable this setting, it stops employees from bypassing the warning, stopping the file download.
If you disable or don't configure this setting, your employees can bypass the warnings and continue to download potentially malicious files.|
+|**Windows 10, version 2004:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing Microsoft Defender SmartScreen prompts for sites (Microsoft Edge version 77 or later)
**Windows 10, version 1703:** Administrative Templates\Windows Components\Windows Defender SmartScreen\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing Microsoft Defender SmartScreen prompts for sites (Microsoft Edge version 77 or later)
**Windows 10, Version 1511 and 1607:** Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows SmartScreen prompts for sites|Microsoft Edge on Windows 10, version 1511 or later|This policy setting stops employees from bypassing the Microsoft Defender SmartScreen warnings about potentially malicious sites.
If you enable this setting, it stops employees from bypassing the warning, stopping them from going to the site.
If you disable or don't configure this setting, your employees can bypass the warnings and continue to visit a potentially malicious site.|
+|Administrative Templates\Windows Components\Internet Explorer\Prevent managing SmartScreen Filter|Internet Explorer 9 or later|This policy setting prevents the employee from managing Microsoft Defender SmartScreen.
If you enable this policy setting, the employee isn't prompted to turn on Microsoft Defender SmartScreen. All website addresses that are not on the filter's allow list are sent automatically to Microsoft without prompting the employee.
If you disable or don't configure this policy setting, the employee is prompted to decide whether to turn on Microsoft Defender SmartScreen during the first-run experience.|
+|Administrative Templates\Windows Components\Internet Explorer\Prevent bypassing SmartScreen Filter warnings|Internet Explorer 8 or later|This policy setting determines whether an employee can bypass warnings from Microsoft Defender SmartScreen.
If you enable this policy setting, Microsoft Defender SmartScreen warnings block the employee.
If you disable or don't configure this policy setting, the employee can bypass Microsoft Defender SmartScreen warnings.|
+|Administrative Templates\Windows Components\Internet Explorer\Prevent bypassing SmartScreen Filter warnings about files that are not commonly downloaded from the Internet|Internet Explorer 9 or later|This policy setting determines whether the employee can bypass warnings from Microsoft Defender SmartScreen. Microsoft Defender SmartScreen warns the employee about executable files that Internet Explorer users do not commonly download from the Internet.
If you enable this policy setting, Microsoft Defender SmartScreen warnings block the employee.
If you disable or don't configure this policy setting, the employee can bypass Microsoft Defender SmartScreen warnings.|
+
## MDM settings
If you manage your policies using Microsoft Intune, you'll want to use these MDM policy settings. All settings support desktop computers running Windows 10 Pro or Windows 10 Enterprise, enrolled with Microsoft Intune.
For Microsoft Defender SmartScreen Edge MDM policies, see [Policy CSP - Browser](/windows/client-management/mdm/policy-csp-browser).
-
-
-| Setting |
-Supported versions |
-Details |
-
-
-| AllowSmartScreen |
-Windows 10 |
-
-
-- URI full path. ./Vendor/MSFT/Policy/Config/Browser/AllowSmartScreen
-- Data type. Integer
-- Allowed values:
-- 0 . Turns off Microsoft Defender SmartScreen in Edge.
-- 1. Turns on Microsoft Defender SmartScreen in Edge.
- |
-
-
-| EnableAppInstallControl |
-Windows 10, version 1703 |
-
-
-- URI full path. ./Vendor/MSFT/Policy/Config/SmartScreen/EnableAppInstallControl
-- Data type. Integer
-- Allowed values:
-- 0 . Turns off Application Installation Control, allowing users to download and install files from anywhere on the web.
-- 1. Turns on Application Installation Control, allowing users to install apps from the Microsoft Store only.
- |
-
-
-| EnableSmartScreenInShell |
-Windows 10, version 1703 |
-
-
-- URI full path. ./Vendor/MSFT/Policy/Config/SmartScreen/EnableSmartScreenInShell
-- Data type. Integer
-- Allowed values:
-- 0 . Turns off Microsoft Defender SmartScreen in Windows for app and file execution.
-- 1. Turns on Microsoft Defender SmartScreen in Windows for app and file execution.
- |
-
-
-| PreventOverrideForFilesInShell |
-Windows 10, version 1703 |
-
-
-- URI full path. ./Vendor/MSFT/Policy/Config/SmartScreen/PreventOverrideForFilesInShell
-- Data type. Integer
-- Allowed values:
-- 0 . Employees can ignore Microsoft Defender SmartScreen warnings and run malicious files.
-- 1. Employees can't ignore Microsoft Defender SmartScreen warnings and run malicious files.
- |
-
-
-| PreventSmartScreenPromptOverride |
-Windows 10, Version 1511 and Windows 11 |
-
-
-- URI full path. ./Vendor/MSFT/Policy/Config/Browser/PreventSmartscreenPromptOverride
-- Data type. Integer
-- Allowed values:
-- 0 . Employees can ignore Microsoft Defender SmartScreen warnings.
-- 1. Employees can't ignore Microsoft Defender SmartScreen warnings.
- |
-
-
-| PreventSmartScreenPromptOverrideForFiles |
-Windows 10, Version 1511 and Windows 11 |
-
-
-- URI full path. ./Vendor/MSFT/Policy/Config/Browser/PreventSmartScreenPromptOverrideForFiles
-- Data type. Integer
-- Allowed values:
-- 0 . Employees can ignore Microsoft Defender SmartScreen warnings for files.
-- 1. Employees can't ignore Microsoft Defender SmartScreen warnings for files.
- |
-
-
+
+|Setting|Supported versions|Details|
+|--- |--- |--- |
+|AllowSmartScreen|Windows 10|- **URI full path.** ./Vendor/MSFT/Policy/Config/Browser/AllowSmartScreen
- **Data type.** Integer**Allowed values:**
- **0 .** Turns off Microsoft Defender SmartScreen in Edge.
- **1.** Turns on Microsoft Defender SmartScreen in Edge.|
+|EnableAppInstallControl|Windows 10, version 1703|
- **URI full path.** ./Vendor/MSFT/Policy/Config/SmartScreen/EnableAppInstallControl
- **Data type.** Integer**Allowed values:**
- **0 .** Turns off Application Installation Control, allowing users to download and install files from anywhere on the web.
- **1.** Turns on Application Installation Control, allowing users to install apps from the Microsoft Store only.|
+|EnableSmartScreenInShell|Windows 10, version 1703|
- **URI full path.** ./Vendor/MSFT/Policy/Config/SmartScreen/EnableSmartScreenInShell
- **Data type.** Integer**Allowed values:**
- **0 .** Turns off Microsoft Defender SmartScreen in Windows for app and file execution.
- **1.** Turns on Microsoft Defender SmartScreen in Windows for app and file execution.|
+|PreventOverrideForFilesInShell|Windows 10, version 1703|
- **URI full path.** ./Vendor/MSFT/Policy/Config/SmartScreen/PreventOverrideForFilesInShell
- **Data type.** Integer**Allowed values:**
- **0 .** Employees can ignore Microsoft Defender SmartScreen warnings and run malicious files.
- **1.** Employees can't ignore Microsoft Defender SmartScreen warnings and run malicious files.|
+|PreventSmartScreenPromptOverride|Windows 10, Version 1511 and Windows 11|
- **URI full path.** ./Vendor/MSFT/Policy/Config/Browser/PreventSmartscreenPromptOverride
- **Data type.** Integer**Allowed values:**
- **0 .** Employees can ignore Microsoft Defender SmartScreen warnings.
- **1.** Employees can't ignore Microsoft Defender SmartScreen warnings.|
+|PreventSmartScreenPromptOverrideForFiles|Windows 10, Version 1511 and Windows 11|
- **URI full path.** ./Vendor/MSFT/Policy/Config/Browser/PreventSmartScreenPromptOverrideForFiles
- **Data type.** Integer**Allowed values:**
- **0 .** Employees can ignore Microsoft Defender SmartScreen warnings for files.
- **1.** Employees can't ignore Microsoft Defender SmartScreen warnings for files.|
## Recommended Group Policy and MDM settings for your organization
By default, Microsoft Defender SmartScreen lets employees bypass warnings. Unfortunately, this feature can let employees continue to an unsafe site or to continue to download an unsafe file, even after being warned. Because of this possibility, we strongly recommend that you set up Microsoft Defender SmartScreen to block high-risk interactions instead of providing just a warning.
To better help you protect your organization, we recommend turning on and using these specific Microsoft Defender SmartScreen Group Policy and MDM settings.
-
-
-| Group Policy setting |
-Recommendation |
-
-
-| Administrative Templates\Windows Components\Microsoft Edge\Configure Windows Defender SmartScreen (Microsoft Edge version 45 and earlier) Administrative Templates\Microsoft Edge\SmartScreen settings\Configure Microsoft Defender SmartScreen (Microsoft Edge version 77 or later) |
-Enable. Turns on Microsoft Defender SmartScreen. |
-
-
-| Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 45 and earlier) Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 77 or later) |
-Enable. Stops employees from ignoring warning messages and continuing to a potentially malicious website. |
-
-
-| Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files (Microsoft Edge version 45 and earlier) Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing of Microsoft Defender SmartScreen warnings about downloads (Microsoft Edge version 77 or later) |
-Enable. Stops employees from ignoring warning messages and continuing to download potentially malicious files. |
-
-
-| Administrative Templates\Windows Components\File Explorer\Configure Windows Defender SmartScreen |
-Enable with the Warn and prevent bypass option. Stops employees from ignoring warning messages about malicious files downloaded from the Internet. |
-
-
-
-
-
-| MDM setting |
-Recommendation |
-
-
-| Browser/AllowSmartScreen |
-1. Turns on Microsoft Defender SmartScreen. |
-
-
-| Browser/PreventSmartScreenPromptOverride |
-1. Stops employees from ignoring warning messages and continuing to a potentially malicious website. |
-
-
-| Browser/PreventSmartScreenPromptOverrideForFiles |
-1. Stops employees from ignoring warning messages and continuing to download potentially malicious files. |
-
-
-| SmartScreen/EnableSmartScreenInShell |
-1. Turns on Microsoft Defender SmartScreen in Windows. Requires at least Windows 10, version 1703. |
-
-
-| SmartScreen/PreventOverrideForFilesInShell |
-1. Stops employees from ignoring warning messages about malicious files downloaded from the Internet. Requires at least Windows 10, version 1703. |
-
-
+
+|Group Policy setting|Recommendation|
+|--- |--- |
+|Administrative Templates\Windows Components\Microsoft Edge\Configure Windows Defender SmartScreen (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Configure Microsoft Defender SmartScreen (Microsoft Edge version 77 or later)|**Enable.** Turns on Microsoft Defender SmartScreen.|
+|Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing Windows Defender SmartScreen prompts for sites (Microsoft Edge version 77 or later)|**Enable.** Stops employees from ignoring warning messages and continuing to a potentially malicious website.|
+|Administrative Templates\Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files (Microsoft Edge version 45 and earlier)
Administrative Templates\Microsoft Edge\SmartScreen settings\Prevent bypassing of Microsoft Defender SmartScreen warnings about downloads (Microsoft Edge version 77 or later)|**Enable.** Stops employees from ignoring warning messages and continuing to download potentially malicious files.|
+|Administrative Templates\Windows Components\File Explorer\Configure Windows Defender SmartScreen|**Enable with the Warn and prevent bypass option.** Stops employees from ignoring warning messages about malicious files downloaded from the Internet.|
+
+|MDM setting|Recommendation|
+|--- |--- |
+|Browser/AllowSmartScreen|**1.** Turns on Microsoft Defender SmartScreen.|
+|Browser/PreventSmartScreenPromptOverride|**1.** Stops employees from ignoring warning messages and continuing to a potentially malicious website.|
+|Browser/PreventSmartScreenPromptOverrideForFiles|**1.** Stops employees from ignoring warning messages and continuing to download potentially malicious files.|
+|SmartScreen/EnableSmartScreenInShell|**1.** Turns on Microsoft Defender SmartScreen in Windows.
Requires at least Windows 10, version 1703.|
+|SmartScreen/PreventOverrideForFilesInShell|**1.** Stops employees from ignoring warning messages about malicious files downloaded from the Internet.
Requires at least Windows 10, version 1703.|
## Related topics
+
- [Threat protection](../index.md)
- [Microsoft Defender SmartScreen overview](microsoft-defender-smartscreen-overview.md)
-- [Available Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge](/microsoft-edge/deploy/available-policies)
\ No newline at end of file
+- [Available Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge](/microsoft-edge/deploy/available-policies)
diff --git a/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md b/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md
index fdd4c1c7d4..d75785dec2 100644
--- a/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md
+++ b/windows/security/threat-protection/overview-of-threat-mitigations-in-windows-10.md
@@ -308,58 +308,13 @@ The following table lists EMET features in relation to Windows 10 features.
### Table 5 EMET features in relation to Windows 10 features
-
-
-
-
-
-
- |
-DEP, SEHOP, and ASLR are included in Windows 10 as configurable features. See Table 2, earlier in this topic.
-You can install the ProcessMitigations PowerShell module to convert your EMET settings for these features into policies that you can apply to Windows 10. |
-
-
- |
-LoadLib and MemProt are supported in Windows 10, for all applications that are written to use these functions. See Table 4, earlier in this topic. |
-
-
- |
-Mitigations for this threat are built into Windows 10, as described in the "Memory reservations" item in Kernel pool protections, earlier in this topic. |
-
-
- |
-Windows 10 does not include mitigations that map specifically to these EMET features because they have low impact in the current threat landscape, and do not significantly increase the difficulty of exploiting vulnerabilities. Microsoft remains committed to monitoring the security environment as new exploits appear and taking steps to harden the operating system against them. |
-
-
-
-Caller Check Simulate Execution Flow Stack Pivot Deep Hooks (an ROP "Advanced Mitigation") Anti Detours (an ROP "Advanced Mitigation") Banned Functions (an ROP "Advanced Mitigation") |
-Mitigated in Windows 10 with applications compiled with Control Flow Guard, as described in Control Flow Guard, earlier in this topic. |
-
-
-
+|Specific EMET features|How these EMET features map to Windows 10 features|
+|--- |--- |
+| - DEP
- SEHOP
- ASLR (Force ASLR, Bottom-up ASLR)|DEP, SEHOP, and ASLR are included in Windows 10 as configurable features. See [Table 2](#table-2), earlier in this topic.You can install the ProcessMitigations PowerShell module to convert your EMET settings for these features into policies that you can apply to Windows 10.|
+|
- Load Library Check (LoadLib)
- Memory Protection Check (MemProt)|LoadLib and MemProt are supported in Windows 10, for all applications that are written to use these functions. See [Table 4](#functions-that-software-vendors-can-use-to-build-mitigations-into-apps), earlier in this topic.|
+|Null Page|Mitigations for this threat are built into Windows 10, as described in the "Memory reservations" item in [Kernel pool protections](#kernel-pool-protections), earlier in this topic.|
+|
- Heap Spray
- EAF
- EAF+|Windows 10 does not include mitigations that map specifically to these EMET features because they have low impact in the current threat landscape, and do not significantly increase the difficulty of exploiting vulnerabilities. Microsoft remains committed to monitoring the security environment as new exploits appear and taking steps to harden the operating system against them.|
+|
- Caller Check
- Simulate Execution Flow
- Stack Pivot
- Deep Hooks (an ROP "Advanced Mitigation")
- Anti Detours (an ROP "Advanced Mitigation")
- Banned Functions (an ROP "Advanced Mitigation")|Mitigated in Windows 10 with applications compiled with Control Flow Guard, as described in [Control Flow Guard](#control-flow-guard), earlier in this topic.|
### Converting an EMET XML settings file into Windows 10 mitigation policies
diff --git a/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md b/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
index 29993c408e..958eae7a5c 100644
--- a/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
+++ b/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md
@@ -336,49 +336,13 @@ For more information on device health attestation, see the [Detect an unhealthy
The following table details the hardware requirements for both virtualization-based security services and the health attestation feature. For more information, see [Minimum hardware requirements](/windows-hardware/design/minimum/minimum-hardware-requirements-overview).
-
-
-
-
-
-
-
-
-
-
-UEFI 2.3.1 or later firmware with Secure Boot enabled |
-Required to support UEFI Secure Boot.
-UEFI Secure Boot ensures that the device boots only authorized code.
-Additionally, Boot Integrity (Platform Secure Boot) must be supported following the requirements in Hardware Compatibility Specification for Systems for Windows 10 under the subsection: “System.Fundamentals.Firmware.CS.UEFISecureBoot.ConnectedStandby” |
-
-
-Virtualization extensions, such as Intel VT-x, AMD-V, and SLAT must be enabled |
-Required to support virtualization-based security.
-
- NoteDevice Guard can be enabled without using virtualization-based security.
-
-
- |
-
-
-X64 processor |
-Required to support virtualization-based security that uses Windows Hypervisor. Hyper-V is supported only on x64 processor (and not on x86).
-Direct Memory Access (DMA) protection can be enabled to provide additional memory protection but requires processors to include DMA protection technologies. |
-
-
-IOMMU, such as Intel VT-d, AMD-Vi |
-Support for the IOMMU in Windows 10 enhances system resiliency against DMA attacks. |
-
-
-Trusted Platform Module (TPM) |
-Required to support health attestation and necessary for additional key protections for virtualization-based security. TPM 2.0 is supported. Support for TPM 1.2 was added beginning in Windows 10, version 1607 (RS1) |
-
-
-
+|Hardware|Motivation|
+|--- |--- |
+|UEFI 2.3.1 or later firmware with Secure Boot enabled|Required to support UEFI Secure Boot.UEFI Secure Boot ensures that the device boots only authorized code.
Additionally, Boot Integrity (Platform Secure Boot) must be supported following the requirements in Hardware Compatibility Specification for Systems for Windows 10 under the subsection: “System.Fundamentals.Firmware.CS.UEFISecureBoot.ConnectedStandby”|
+|Virtualization extensions, such as Intel VT-x, AMD-V, and SLAT must be enabled|Required to support virtualization-based security.
**Note:** Device Guard can be enabled without using virtualization-based security.
|
+|X64 processor|Required to support virtualization-based security that uses Windows Hypervisor. Hyper-V is supported only on x64 processor (and not on x86).Direct Memory Access (DMA) protection can be enabled to provide additional memory protection but requires processors to include DMA protection technologies.|
+|IOMMU, such as Intel VT-d, AMD-Vi|Support for the IOMMU in Windows 10 enhances system resiliency against DMA attacks.|
+|Trusted Platform Module (TPM)|Required to support health attestation and necessary for additional key protections for virtualization-based security. TPM 2.0 is supported. Support for TPM 1.2 was added beginning in Windows 10, version 1607 (RS1)|
This section presented information about several closely related controls in Windows 10. The multi-layer defenses and in-depth approach helps to eradicate low-level malware during boot sequence. Virtualization-based security is a fundamental operating system architecture change that adds a new security boundary. Device Guard and Credential Guard respectively help to block untrusted code and protect corporate domain credentials from theft and reuse. This section also briefly discussed the importance of managing devices and patching vulnerabilities. All these technologies can be used to harden and lock down devices while limiting the risk of attackers compromising them.
@@ -591,36 +555,9 @@ For completeness of the measurements, see [Health Attestation CSP](/windows/clie
The following table presents some key items that can be reported back to MDM depending on the type of Windows 10-based device.
-
-
-
-
-
-
-
-
-
-
-
-Windows 10 for desktop editions |
-
-PCR0 measurement Secure Boot Enabled Secure Boot db matches Expected Secure Boot dbx is up to date Secure Boot policy GUID matches Expected BitLocker enabled Virtualization-based security enabled ELAM was loaded Code Integrity version is up to date Code Integrity policy hash matches Expected |
-
-
-
+|OS type|Key items that can be reported|
+|--- |--- |
+|Windows 10 for desktop editions| - PCR0 measurement
- Secure Boot Enabled
- Secure Boot db matches Expected
- Secure Boot dbx is up to date
- Secure Boot policy GUID matches Expected
- BitLocker enabled
- Virtualization-based security enabled
- ELAM was loaded
- Code Integrity version is up to date
- Code Integrity policy hash matches Expected|
### Leverage MDM and the Health Attestation Service
diff --git a/windows/security/threat-protection/security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md b/windows/security/threat-protection/security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
index dc462f0224..7cc7a09a81 100644
--- a/windows/security/threat-protection/security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
+++ b/windows/security/threat-protection/security-policy-settings/audit-shut-down-system-immediately-if-unable-to-log-security-audits.md
@@ -30,18 +30,9 @@ Describes the best practices, location, values, management practices, and securi
The **Audit: Shut down system immediately if unable to log security audits** policy setting determines whether the system shuts down if it is unable to log security events. This policy setting is a requirement for Trusted Computer System Evaluation Criteria (TCSEC)-C2 and Common Criteria certification to prevent auditable events from occurring if the audit system is unable to log those events. Microsoft has chosen to meet this requirement by halting the system and displaying a Stop message in the case of a failure of the auditing system. Enabling this policy setting stops the system if a security audit cannot be logged for any reason. Typically, an event fails to be logged when the security audit log is full and the value of **Retention method for security log** is **Do not overwrite events (clear log manually)** or **Overwrite events by days**.
With **Audit: Shut down system immediately if unable to log security audits** set to **Enabled**, if the security log is full and an existing entry cannot be overwritten, the following Stop message appears:
-
-
-
-
-
-
-STOP: C0000244 {Audit Failed}
-An attempt to generate a security audit failed. |
-
-
-
-
+
+**STOP: C0000244 {Audit Failed}**: An attempt to generate a security audit failed.
+
To recover, you must log on, archive the log (optional), clear the log, and reset this option as desired.
If the computer is unable to record events to the security log, critical evidence or important troubleshooting information might not be available for review after a security incident.
diff --git a/windows/security/threat-protection/windows-10-mobile-security-guide.md b/windows/security/threat-protection/windows-10-mobile-security-guide.md
index 264a762b9c..cd44f7491b 100644
--- a/windows/security/threat-protection/windows-10-mobile-security-guide.md
+++ b/windows/security/threat-protection/windows-10-mobile-security-guide.md
@@ -44,7 +44,8 @@ Because Windows Hello is supported across all Windows 10 devices, organizations
Windows Hello supports iris scan, fingerprint, and facial recognition-based authentication for devices that have biometric sensors.
->**Note:** When Windows 10 first shipped, it included **Microsoft Passport** and **Windows Hello**, which worked together to provide multifactor authentication. To simplify deployment and improve supportability, Microsoft has combined these technologies into a single solution under the **Windows Hello** name. Customers who have already deployed these technologies will not experience any change in functionality. Customers who have yet to evaluate Windows Hello will find it easier to deploy due to simplified policies, documentation, and semantics.
+> [!NOTE]
+> When Windows 10 first shipped, it included **Microsoft Passport** and **Windows Hello**, which worked together to provide multifactor authentication. To simplify deployment and improve supportability, Microsoft has combined these technologies into a single solution under the **Windows Hello** name. Customers who have already deployed these technologies will not experience any change in functionality. Customers who have yet to evaluate Windows Hello will find it easier to deploy due to simplified policies, documentation, and semantics.
### Secured credentials
@@ -61,7 +62,8 @@ Windows Hello supports three biometric sensor scenarios:
- **Fingerprint recognition** uses a sensor to scan the user’s fingerprint. Although fingerprint readers have been available for computers running the Windows operating system for years, the detection, anti-spoofing, and recognition algorithms in Windows 10 are more advanced than in previous Windows versions. Most existing fingerprint readers (whether external to or integrated into laptops or USB keyboards) that support the Windows Biometric Framework will work with Windows Hello.
- **Iris scanning** uses cameras designed to scan the user’s iris, the colorful and highly detailed portion of the eye. Because the data must be accurate, iris scanning uses a combination of an IR light source and a high-quality camera. Microsoft Lumia 950 and 950 XL devices support this technology.
->Users must create an unlock PIN while they enroll a biometric gesture. The device uses this PIN as a fallback mechanism in situations where it cannot capture the biometric gesture.
+> [!NOTE]
+> Users must create an unlock PIN while they enroll a biometric gesture. The device uses this PIN as a fallback mechanism in situations where it cannot capture the biometric gesture.
All three of these biometric factors – face, finger, and iris – are unique to an individual. To capture enough data to uniquely identify an individual, a biometric scanner might initially capture images in multiple conditions or with additional details. For example, an iris scanner will capture images of both eyes or both eyes with and without eyeglasses or contact lenses.
@@ -156,59 +158,21 @@ Windows 10 Mobile supports both [FIPS 140 standards](http://csrc.nist.gov/groups
The best way to fight malware is prevention. Windows 10 Mobile provides strong malware resistance through secured hardware, startup process defenses, core operating system architecture, and application-level protections.
The table below outlines how Windows 10 Mobile mitigates specific malware threats.
-
-
-
-
-
-
-
-
-
-
-Firmware bootkits replace the firmware with malware. |
-All certified devices include Unified Extensible Firmware (UEFI) with Secure Boot, which requires signed firmware for updates to UEFI and Option ROMs. |
-
-
-Bootkits start malware before Windows starts. |
-UEFI with Secure Boot verifies Windows bootloader integrity to help ensure that no malicious operating system can start before Windows. |
-
-
-System or driver rootkits (typically malicious software that hides from the operating system) start kernel- level malware while Windows is starting, before antimalware solutions can start. |
-Windows Trusted Boot verifies Windows boot components, including Microsoft drivers. Measured Boot runs in parallel with Trusted Boot and can provide information to a remote server that verifies the boot state of the device to help ensure that Trusted Boot and other boot components successfully checked the system. |
-
-
-An app infects other apps or the operating system with malware. |
-All Windows 10 Mobile apps run inside an AppContainer that isolates them from all other processes and sensitive operating system components. Apps cannot access any resources outside their AppContainer. |
-
-
-An unauthorized app or malware attempts to start on the device. |
-All Windows 10 Mobile apps must come from Microsoft Store or Microsoft Store for Business. Device Guard enforces administrative policies to select exactly which apps are allowed to run. |
-
-
-User-level malware exploits a vulnerability in the system or an application and owns the device. |
-Improvements to address space layout randomization (ASLR), Data Execution Prevention (DEP), the heap architecture, and memory-management algorithms reduce the likelihood that vulnerabilities can enable successful exploits.
-Protected Processes isolates non-trusted processes from each other and from sensitive operating system components. |
-
-
-Users access a dangerous website without knowledge of the risk. |
-The Windows Defender SmartScreen URL Reputation feature prevents users from going to a malicious website that may try to exploit the browser and take control of the device. |
-
-
-Malware exploits a vulnerability in a browser add-on. |
-Microsoft Edge is an app built on the Universal Windows Platform (UWP) that does not run legacy binary extensions, including Microsoft ActiveX and browser helper objects frequently used for toolbars, which eliminates these risks. |
-
-
-A website that includes malicious code exploits a vulnerability in the web browser to run malware on the client device. |
-Microsoft Edge includes Enhanced Protected Mode, which uses AppContainer-based sandboxing to help protect the system against vulnerabilities that at attacker may discover in the extensions running in the browser (for example, Adobe Flash, Java) or the browser itself. |
-
-
-
+|Threat|Windows 10 Mobile mitigation|
+|--- |--- |
+|Firmware bootkits replace the firmware with malware.|All certified devices include Unified Extensible Firmware (UEFI) with Secure Boot, which requires signed firmware for updates to UEFI and Option ROMs.|
+|Bootkits start malware before Windows starts.|UEFI with Secure Boot verifies Windows bootloader integrity to help ensure that no malicious operating system can start before Windows.|
+|System or driver rootkits (typically malicious software that hides from the operating system) start kernel- level malware while Windows is starting, before antimalware solutions can start.|Windows Trusted Boot verifies Windows boot components, including Microsoft drivers. Measured Boot runs in parallel with Trusted Boot and can provide information to a remote server that verifies the boot state of the device to help ensure that Trusted Boot and other boot components successfully checked the system.|
+|An app infects other apps or the operating system with malware.|All Windows 10 Mobile apps run inside an AppContainer that isolates them from all other processes and sensitive operating system components. Apps cannot access any resources outside their AppContainer.|
+|An unauthorized app or malware attempts to start on the device.|All Windows 10 Mobile apps must come from Microsoft Store or Microsoft Store for Business. Device Guard enforces administrative policies to select exactly which apps are allowed to run.|
+|User-level malware exploits a vulnerability in the system or an application and owns the device.|Improvements to address space layout randomization (ASLR), Data Execution Prevention (DEP), the heap architecture, and memory-management algorithms reduce the likelihood that vulnerabilities can enable successful exploits.Protected Processes isolates non-trusted processes from each other and from sensitive operating system components.|
+|Users access a dangerous website without knowledge of the risk.|The Windows Defender SmartScreen URL Reputation feature prevents users from going to a malicious website that may try to exploit the browser and take control of the device.|
+|Malware exploits a vulnerability in a browser add-on.|Microsoft Edge is an app built on the Universal Windows Platform (UWP) that does not run legacy binary extensions, including Microsoft ActiveX and browser helper objects frequently used for toolbars, which eliminates these risks.|
+|A website that includes malicious code exploits a vulnerability in the web browser to run malware on the client device.|Microsoft Edge includes Enhanced Protected Mode, which uses AppContainer-based sandboxing to help protect the system against vulnerabilities that at attacker may discover in the extensions running in the browser (for example, Adobe Flash, Java) or the browser itself.|
->**Note:** The Windows 10 Mobile devices use a System on a Chip (SoC) design provided by SoC vendors such as Qualcomm. With this architecture, the SoC vendor and device manufacturers provide the pre-UEFI bootloaders and the UEFI environment. The UEFI environment implements the UEFI Secure Boot standard described in section 27 of the UEFI specification, which can be found at [www.uefi.org/specs]( http://www.uefi.org/specs). This standard describes the process by which all UEFI drivers and applications are validated against keys provisioned into a UEFI-based device before they are executed.
+
+> [!NOTE]
+> The Windows 10 Mobile devices use a System on a Chip (SoC) design provided by SoC vendors such as Qualcomm. With this architecture, the SoC vendor and device manufacturers provide the pre-UEFI bootloaders and the UEFI environment. The UEFI environment implements the UEFI Secure Boot standard described in section 27 of the UEFI specification, which can be found at [www.uefi.org/specs]( http://www.uefi.org/specs). This standard describes the process by which all UEFI drivers and applications are validated against keys provisioned into a UEFI-based device before they are executed.
### UEFI with Secure Boot
@@ -237,7 +201,8 @@ Windows 10 Mobile supports TPM implementations that comply with the 2.0 standard
Many assume that original equipment manufacturers (OEMs) must implant a TPM in hardware on a motherboard as a discrete module, but TPM can also be effective when implemented in firmware. Windows 10 Mobile supports only firmware TPM that complies with the 2.0 standard. Windows does not differentiate between discrete and firmware-based solutions because both must meet the same implementation and security requirements. Therefore, any Windows 10 feature that can take advantage of TPM can be used with Windows 10 Mobile.
->Microsoft requires TPM 2.0 on devices running any version of Windows 10 Mobile. For more information, see [minimum hardware requirements](/windows-hardware/design/minimum/minimum-hardware-requirements-overview)
+> [!NOTE]
+> Microsoft requires TPM 2.0 on devices running any version of Windows 10 Mobile. For more information, see [minimum hardware requirements](/windows-hardware/design/minimum/minimum-hardware-requirements-overview)
Several Windows 10 Mobile security features require TPM:
- Virtual smart cards
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/create-a-rule-for-packaged-apps.md b/windows/security/threat-protection/windows-defender-application-control/applocker/create-a-rule-for-packaged-apps.md
index f983e81eba..1c676d9236 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/create-a-rule-for-packaged-apps.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/create-a-rule-for-packaged-apps.md
@@ -50,77 +50,22 @@ You can perform this task by using the Group Policy Management Console for an Ap
3. On the **Before You Begin** page, select **Next**.
4. On the **Permissions** page, select the action (allow or deny) and the user or group that the rule should apply to, and then select **Next**.
5. On the **Publisher** page, you can select a specific reference for the packaged app rule and set the scope for the rule. The following table describes the reference options.
-
-
-
-
-
-
-
-
-
-
-
- Use an installed packaged app as a reference |
- If selected, AppLocker requires you to choose an app that is already installed on which to base your new rule. AppLocker uses the publisher, package name and package version to define the rule. |
- You want the Sales group only to use the app named Microsoft.BingMaps for its outside sales calls. The Microsoft.BingMaps app is already installed on the device where you are creating the rule, so you choose this option, and select the app from the list of apps installed on the computer and create the rule using this app as a reference. |
-
-
- Use a packaged app installer as a reference |
- If selected, AppLocker requires you to choose an app installer on which to base your new rule. A packaged app installer has the .appx extension. AppLocker uses the publisher, package name, and package version of the installer to define the rule. |
- Your company has developed many internal line-of-business packaged apps. The app installers are stored on a common file share. Employees can install the required apps from that file share. You want to allow all your employees to install the Payroll app from this share. So you choose this option from the wizard, browse to the file share, and choose the installer for the Payroll app as a reference to create your rule. |
-
-
-
-
+
+ |Selection|Description|Example|
+ |--- |--- |--- |
+ |**Use an installed packaged app as a reference**|If selected, AppLocker requires you to choose an app that is already installed on which to base your new rule. AppLocker uses the publisher, package name and package version to define the rule.|You want the Sales group only to use the app named Microsoft.BingMaps for its outside sales calls. The Microsoft.BingMaps app is already installed on the device where you are creating the rule, so you choose this option, and select the app from the list of apps installed on the computer and create the rule using this app as a reference.|
+ |**Use a packaged app installer as a reference**|If selected, AppLocker requires you to choose an app installer on which to base your new rule. A packaged app installer has the .appx extension. AppLocker uses the publisher, package name, and package version of the installer to define the rule.|Your company has developed many internal line-of-business packaged apps. The app installers are stored on a common file share. Employees can install the required apps from that file share. You want to allow all your employees to install the Payroll app from this share. So you choose this option from the wizard, browse to the file share, and choose the installer for the Payroll app as a reference to create your rule.|
+
The following table describes setting the scope for the packaged app rule.
-
-
-
-
-
-
-
-
-
-
-
- Applies to Any publisher |
- This is the least restrictive scope condition for an Allow rule. It permits every packaged app to run or install.
- Conversely, if this is a Deny rule, then this option is the most restrictive because it denies all apps from installing or running. |
- You want the Sales group to use any packaged app from any signed publisher. You set the permissions to allow the Sales group to be able to run any app. |
-
-
- Applies to a specific Publisher |
- This scopes the rule to all apps published by a particular publisher. |
- You want to allow all your users to install apps published by the publisher of Microsoft.BingMaps. You could select Microsoft.BingMaps as a reference and choose this rule scope. |
-
-
- Applies to a Package name |
- This scopes the rule to all packages that share the publisher name and package name as the reference file. |
- You want to allow your Sales group to install any version of the Microsoft.BingMaps app. You could select the Microsoft.BingMaps app as a reference and choose this rule scope. |
-
-
- Applies to a Package version |
- This scopes the rule to a particular version of the package. |
- You want to be very selective in what you allow. You do not want to implicitly trust all future updates of the Microsoft.BingMaps app. You can limit the scope of your rule to the version of the app currently installed on your reference computer. |
-
-
- Applying custom values to the rule |
- Selecting the Use custom values check box allows you to adjust the scope fields for your particular circumstance. |
- You want to allow users to install all Microsoft.Bing* applications, which include Microsoft.BingMaps, Microsoft.BingWeather, Microsoft.BingMoney. You can choose the Microsoft.BingMaps as a reference, select the Use custom values check box and edit the package name field by adding “Microsoft.Bing*” as the Package name. |
-
-
-
-
+
+ |Selection|Description|Example|
+ |--- |--- |--- |
+ |Applies to **Any publisher**|This is the least restrictive scope condition for an **Allow** rule. It permits every packaged app to run or install.
Conversely, if this is a **Deny** rule, then this option is the most restrictive because it denies all apps from installing or running. | You want the Sales group to use any packaged app from any signed publisher. You set the permissions to allow the Sales group to be able to run any app.|
+ |Applies to a specific **Publisher** | This scopes the rule to all apps published by a particular publisher. | You want to allow all your users to install apps published by the publisher of Microsoft.BingMaps. You could select Microsoft.BingMaps as a reference and choose this rule scope. |
+ |Applies to a **Package name** | This scopes the rule to all packages that share the publisher name and package name as the reference file. | You want to allow your Sales group to install any version of the Microsoft.BingMaps app. You could select the Microsoft.BingMaps app as a reference and choose this rule scope. |
+ |Applies to a **Package version** | This scopes the rule to a particular version of the package. | You want to be very selective in what you allow. You do not want to implicitly trust all future updates of the Microsoft.BingMaps app. You can limit the scope of your rule to the version of the app currently installed on your reference computer. |
+ |Applying custom values to the rule | Selecting the **Use custom values** check box allows you to adjust the scope fields for your particular circumstance. | You want to allow users to install all *Microsoft.Bing* applications, which include Microsoft.BingMaps, Microsoft.BingWeather, Microsoft.BingMoney. You can choose the Microsoft.BingMaps as a reference, select the **Use custom values** check box and edit the package name field by adding “Microsoft.Bing*” as the Package name. |
+
6. Select **Next**.
7. (Optional) On the **Exceptions** page, specify conditions by which to exclude files from being affected by the rule. This allows you to add exceptions based on the same rule reference and rule scope as you set before. Select **Next**.
8. On the **Name** page, either accept the automatically generated rule name or type a new rule name, and then select **Create**.
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/determine-your-application-control-objectives.md b/windows/security/threat-protection/windows-defender-application-control/applocker/determine-your-application-control-objectives.md
index e4bdbbc2b7..bb43e3b175 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/determine-your-application-control-objectives.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/determine-your-application-control-objectives.md
@@ -37,137 +37,23 @@ There are management and maintenance costs associated with a list of allowed app
Use the following table to develop your own objectives and determine which application control feature best addresses those objectives.
-
-
-
-
-
-
-
-
-
-
-
-Scope |
-SRP policies can be applied to all Windows operating systems beginning with Windows XP and Windows Server 2003. |
-AppLocker policies apply only to the support versions of Windows listed in Requirements to use AppLocker. |
-
-
-Policy creation |
-SRP policies are maintained through Group Policy and only the administrator of the GPO can update the SRP policy. The administrator on the local computer can modify the SRP policies defined in the local GPO. |
-AppLocker policies are maintained through Group Policy and only the administrator of the GPO can update the policy. The administrator on the local computer can modify the AppLocker policies defined in the local GPO.
-AppLocker permits customization of error messages to direct users to a Web page for help. |
-
-
-Policy maintenance |
-SRP policies must be updated by using the Local Security Policy snap-in (if the policies are created locally) or the Group Policy Management Console (GPMC). |
-AppLocker policies can be updated by using the Local Security Policy snap-in, if the policies are created locally, or the GPMC, or the Windows PowerShell AppLocker cmdlets. |
-
-
-Policy application |
-SRP policies are distributed through Group Policy. |
-AppLocker policies are distributed through Group Policy. |
-
-
-Enforcement mode |
-SRP works in the “deny list mode” where administrators can create rules for files that they don't want to allow in this Enterprise, but the rest of the files are allowed to run by default.
-SRP can also be configured in the “allow list mode” such that by default all files are blocked and administrators need to create allow rules for files that they want to allow. |
-By default, AppLocker works in allow list mode. Only those files are allowed to run for which there's a matching allow rule. |
-
-
-File types that can be controlled |
-SRP can control the following file types:
-
-Executables DLLs Scripts Windows Installers
-SRP cannot control each file type separately. All SRP rules are in a single rule collection. |
-AppLocker can control the following file types:
-
-AppLocker maintains a separate rule collection for each of the five file types. |
-
-
-Designated file types |
-SRP supports an extensible list of file types that are considered executable. You can add extensions for files that should be considered executable. |
-AppLocker doesn't support this. AppLocker currently supports the following file extensions:
-
-Executables (.exe, .com) DLLs (.ocx, .dll) Scripts (.vbs, .js, .ps1, .cmd, .bat) Windows Installers (.msi, .mst, .msp) Packaged app installers (.appx) |
-
-
-Rule types |
-SRP supports four types of rules:
-
-Hash Path Signature Internet zone |
-AppLocker supports three types of rules:
- |
-
-
-Editing the hash value |
-SRP allows you to select a file to hash. |
-AppLocker computes the hash value itself. Internally it uses the SHA2 Authenticode hash for Portable Executables (exe and DLL) and Windows Installers and an SHA2 flat file hash for the rest. |
-
-
-Support for different security levels |
-With SRP, you can specify the permissions with which an app can run. Then configure a rule such that Notepad always runs with restricted permissions and never with administrative privileges.
-SRP on Windows Vista and earlier supported multiple security levels. On Windows 7, that list was restricted to just two levels: Disallowed and Unrestricted (Basic User translates to Disallowed). |
-AppLocker does not support security levels. |
-
-
-Manage Packaged apps and Packaged app installers. |
-Unable |
-.appx is a valid file type which AppLocker can manage. |
-
-
-Targeting a rule to a user or a group of users |
-SRP rules apply to all users on a particular computer. |
-AppLocker rules can be targeted to a specific user or a group of users. |
-
-
-Support for rule exceptions |
-SRP does not support rule exceptions |
-AppLocker rules can have exceptions that allow administrators to create rules such as “Allow everything from Windows except for Regedit.exe”. |
-
-
-Support for audit mode |
-SRP doesn't support audit mode. The only way to test SRP policies is to set up a test environment and run a few experiments. |
-AppLocker supports audit mode that allows administrators to test the effect of their policy in the real production environment without impacting the user experience. Once you are satisfied with the results, you can start enforcing the policy. |
-
-
-Support for exporting and importing policies |
-SRP does not support policy import/export. |
-AppLocker supports the importing and exporting of policies. This allows you to create AppLocker policy on a sample computer, test it out and then export that policy and import it back into the desired GPO. |
-
-
-Rule enforcement |
-Internally, SRP rules enforcement happens in user-mode, which is less secure. |
-Internally, AppLocker rules for exes and dlls are enforced in kernel-mode, which is more secure than enforcing them in the user-mode. |
-
-
-
+|Application control function|SRP|AppLocker|
+|--- |--- |--- |
+|Scope|SRP policies can be applied to all Windows operating systems beginning with Windows XP and Windows Server 2003.|AppLocker policies apply only to the support versions of Windows listed in[Requirements to use AppLocker](requirements-to-use-applocker.md).|
+|Policy creation|SRP policies are maintained through Group Policy and only the administrator of the GPO can update the SRP policy. The administrator on the local computer can modify the SRP policies defined in the local GPO.|AppLocker policies are maintained through Group Policy and only the administrator of the GPO can update the policy. The administrator on the local computer can modify the AppLocker policies defined in the local GPO.
AppLocker permits customization of error messages to direct users to a Web page for help.|
+|Policy maintenance|SRP policies must be updated by using the Local Security Policy snap-in (if the policies are created locally) or the Group Policy Management Console (GPMC).|AppLocker policies can be updated by using the Local Security Policy snap-in, if the policies are created locally, or the GPMC, or the Windows PowerShell AppLocker cmdlets.|
+|Policy application|SRP policies are distributed through Group Policy.|AppLocker policies are distributed through Group Policy.|
+|Enforcement mode|SRP works in the “deny list mode” where administrators can create rules for files that they don't want to allow in this Enterprise, but the rest of the files are allowed to run by default.
SRP can also be configured in the “allow list mode” such that by default all files are blocked and administrators need to create allow rules for files that they want to allow.|By default, AppLocker works in allow list mode. Only those files are allowed to run for which there's a matching allow rule.|
+|File types that can be controlled|SRP can control the following file types: - Executables
- DLLs
- Scripts
- Windows Installers
SRP cannot control each file type separately. All SRP rules are in a single rule collection.|AppLocker can control the following file types: - Executables
- DLLs
- Scripts
- Windows Installers
- Packaged apps and installers
AppLocker maintains a separate rule collection for each of the five file types.|
+|Designated file types|SRP supports an extensible list of file types that are considered executable. You can add extensions for files that should be considered executable.|AppLocker doesn't support this. AppLocker currently supports the following file extensions: - Executables (.exe, .com)
- DLLs (.ocx, .dll)
- Scripts (.vbs, .js, .ps1, .cmd, .bat)
- Windows Installers (.msi, .mst, .msp)
- Packaged app installers (.appx)|
+|Rule types|SRP supports four types of rules:
- Hash
- Path
- Signature
Internet zone|AppLocker supports three types of rules: - Hash
- Path
- Publisher|
+|Editing the hash value|SRP allows you to select a file to hash.|AppLocker computes the hash value itself. Internally it uses the SHA2 Authenticode hash for Portable Executables (exe and DLL) and Windows Installers and an SHA2 flat file hash for the rest.|
+|Support for different security levels|With SRP, you can specify the permissions with which an app can run. Then configure a rule such that Notepad always runs with restricted permissions and never with administrative privileges.
SRP on Windows Vista and earlier supported multiple security levels. On Windows 7, that list was restricted to just two levels: Disallowed and Unrestricted (Basic User translates to Disallowed).|AppLocker does not support security levels.|
+|Manage Packaged apps and Packaged app installers.|Unable|.appx is a valid file type which AppLocker can manage.|
+|Targeting a rule to a user or a group of users|SRP rules apply to all users on a particular computer.|AppLocker rules can be targeted to a specific user or a group of users.|
+|Support for rule exceptions|SRP does not support rule exceptions|AppLocker rules can have exceptions that allow administrators to create rules such as “Allow everything from Windows except for Regedit.exe”.|
+|Support for audit mode|SRP doesn't support audit mode. The only way to test SRP policies is to set up a test environment and run a few experiments.|AppLocker supports audit mode that allows administrators to test the effect of their policy in the real production environment without impacting the user experience. Once you are satisfied with the results, you can start enforcing the policy.|
+|Support for exporting and importing policies|SRP does not support policy import/export.|AppLocker supports the importing and exporting of policies. This allows you to create AppLocker policy on a sample computer, test it out and then export that policy and import it back into the desired GPO.|
+|Rule enforcement|Internally, SRP rules enforcement happens in user-mode, which is less secure.|Internally, AppLocker rules for exes and dlls are enforced in kernel-mode, which is more secure than enforcing them in the user-mode.|
For more general info, see AppLocker.
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/document-group-policy-structure-and-applocker-rule-enforcement.md b/windows/security/threat-protection/windows-defender-application-control/applocker/document-group-policy-structure-and-applocker-rule-enforcement.md
index 252fb96ede..f21a48c714 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/document-group-policy-structure-and-applocker-rule-enforcement.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/document-group-policy-structure-and-applocker-rule-enforcement.md
@@ -43,96 +43,16 @@ To complete this AppLocker planning document, you should first complete the foll
After you determine how to structure your Group Policy Objects (GPOs) so that you can apply AppLocker policies, you should record your findings. You can use the following table to determine how many GPOs to create (or edit) and which objects they are linked to. If you decided to create custom rules to allow system files to run, note the high-level rule configuration in the **Use default rule or define new rule condition** column.
The following table includes the sample data that was collected when you determined your enforcement settings and the GPO structure for your AppLocker policies.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Teller-East and Teller-West |
-Yes |
-Teller Software |
-C:\Program Files\Woodgrove\Teller.exe |
-File is signed; create a publisher condition |
-Allow |
-Tellers-AppLockerTellerRules |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-Create a path exception to the default rule to exclude \Windows\Temp |
-Allow |
- |
-
-
-Human Resources |
-HR-All |
-Yes |
-Check Payout |
-C:\Program Files\Woodgrove\HR\Checkcut.exe |
-File is signed; create a publisher condition |
-Allow |
-HR-AppLockerHRRules |
-
-
- |
- |
- |
-Time Sheet Organizer
- |
-C:\Program Files\Woodgrove\HR\Timesheet.exe
- |
-File is not signed; create a file hash condition
- |
-Allow |
- |
-
-
- |
- |
- |
-Internet Explorer 7 |
-C:\Program Files\Internet Explorer</p> |
-File is signed; create a publisher condition |
-Deny |
- |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-Use a default rule for the Windows path |
-Allow |
- |
-
-
-
-
+
+|Business group|Organizational unit|Implement AppLocker?|Apps|Installation path|Use default rule or define new rule condition|Allow or deny|GPO name|
+|--- |--- |--- |--- |--- |--- |--- |--- |
+|Bank Tellers|Teller-East and Teller-West|Yes|Teller Software|C:\Program Files\Woodgrove\Teller.exe|File is signed; create a publisher condition|Allow|Tellers-AppLockerTellerRules|
+||||Windows files|C:\Windows|Create a path exception to the default rule to exclude \Windows\Temp|Allow||
+|Human Resources|HR-All|Yes|Check Payout|C:\Program Files\Woodgrove\HR\Checkcut.exe|File is signed; create a publisher condition|Allow|HR-AppLockerHRRules|
+||||Time Sheet Organizer|C:\Program Files\Woodgrove\HR\Timesheet.exe|File is not signed; create a file hash condition|Allow||
+||||Internet Explorer 7|C:\Program Files\Internet Explorer|File is signed; create a publisher condition|Deny||
+||||Windows files|C:\Windows|Use a default rule for the Windows path|Allow||
+
## Next steps
After you have determined the Group Policy structure and rule enforcement strategy for each business group's apps, the following tasks remain:
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-application-list.md b/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-application-list.md
index 33ffa59ce9..5f360731db 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-application-list.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-application-list.md
@@ -42,70 +42,18 @@ Record the name of the app, whether it is signed as indicated by the publisher's
Record the installation path of the apps. For example, Microsoft Office 2016 installs files to *%programfiles%\\Microsoft Office\\Office16\\*, which is *C:\\Program Files\\Microsoft Office\\Office16\\* on most devices.
The following table provides an example of how to list applications for each business group at the early stage of designing your application control policies. Eventually, as more planning information is added to the list, the information can be used to build AppLocker rules.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Teller-East and Teller-West |
-Yes |
-Teller Software |
-C:\Program Files\Woodgrove\Teller.exe |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-
-
-Human Resources |
-HR-All |
-Yes |
-Check Payout |
-C:\Program Files\Woodgrove\HR\Checkcut.exe |
-
-
- |
- |
- |
-Time Sheet Organizer |
-C:\Program Files\Woodgrove\HR\Timesheet.exe |
-
-
- |
- |
- |
-Internet Explorer 7 |
-C:\Program Files\Internet Explorer</p> |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-
-
-
-
->Note: AppLocker only supports publisher rules for Universal Windows apps. Therefore, collecting the installation path information for Universal Windows apps is not necessary.
+
+|Business group|Organizational unit|Implement AppLocker?|Apps|Installation path|
+|--- |--- |--- |--- |--- |
+|Bank Tellers|Teller-East and Teller-West|Yes|Teller Software|C:\Program Files\Woodgrove\Teller.exe|
+||||Windows files|C:\Windows|
+|Human Resources|HR-All|Yes|Check Payout|C:\Program Files\Woodgrove\HR\Checkcut.exe|
+||||Time Sheet Organizer|C:\Program Files\Woodgrove\HR\Timesheet.exe|
+||||Internet Explorer 7|C:\Program Files\Internet Explorer|
+||||Windows files|C:\Windows|
+
+>[!NOTE]
+>AppLocker only supports publisher rules for Universal Windows apps. Therefore, collecting the installation path information for Universal Windows apps is not necessary.
Event processing
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-applocker-rules.md b/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-applocker-rules.md
index 2db8ca7042..151e00dc31 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-applocker-rules.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/document-your-applocker-rules.md
@@ -46,86 +46,15 @@ Document the following items for each business group or organizational unit:
The following table details sample data for documenting rule type and rule condition findings. In addition, you should now consider whether to allow an app to run or deny permission for it to run. For info about these settings, see [Understanding AppLocker allow and deny actions on rules](understanding-applocker-allow-and-deny-actions-on-rules.md).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Teller-East and Teller-West |
-Yes |
-Teller Software |
-C:\Program Files\Woodgrove\Teller.exe |
-File is signed; create a publisher condition |
- |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-Create a path exception to the default rule to exclude \Windows\Temp |
- |
-
-
-Human Resources |
-HR-All |
-Yes |
-Check Payout |
-C:\Program Files\Woodgrove\HR\Checkcut.exe |
-File is signed; create a publisher condition |
- |
-
-
- |
- |
- |
-Time Sheet Organizer |
-C:\Program Files\Woodgrove\HR\Timesheet.exe |
-File is not signed; create a file hash condition |
- |
-
-
- |
- |
- |
-Internet Explorer 7 |
-C:\Program Files\Internet Explorer</p> |
-File is signed; create a publisher condition |
- |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-Use the default rule for the Windows path |
- |
-
-
-
+|Business group|Organizational unit|Implement AppLocker?|Applications|Installation path|Use default rule or define new rule condition|Allow or deny|
+|--- |--- |--- |--- |--- |--- |--- |
+|Bank Tellers|Teller-East and Teller-West|Yes|Teller Software|C:\Program Files\Woodgrove\Teller.exe|File is signed; create a publisher condition||
+||||Windows files|C:\Windows|Create a path exception to the default rule to exclude \Windows\Temp||
+|Human Resources|HR-All|Yes|Check Payout|C:\Program Files\Woodgrove\HR\Checkcut.exe|File is signed; create a publisher condition||
+||||Time Sheet Organizer|C:\Program Files\Woodgrove\HR\Timesheet.exe|File is not signed; create a file hash condition||
+||||Internet Explorer 7|C:\Program Files\Internet Explorer|File is signed; create a publisher condition||
+||||Windows files|C:\Windows|Use the default rule for the Windows path||
-
## Next steps
For each rule, determine whether to use the allow or deny option, and then complete the following tasks:
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/plan-for-applocker-policy-management.md b/windows/security/threat-protection/windows-defender-application-control/applocker/plan-for-applocker-policy-management.md
index b114297f17..2f5df9dc7c 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/plan-for-applocker-policy-management.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/plan-for-applocker-policy-management.md
@@ -87,7 +87,8 @@ As new apps are deployed or existing apps are updated by the software publisher,
You can edit an AppLocker policy by adding, changing, or removing rules. However, you cannot specify a version for the policy by importing additional rules. To ensure version control when modifying an AppLocker policy, use Group Policy management software that allows you to create versions of Group Policy Objects (GPOs). An example of this type of software is the Advanced Group Policy Management feature from the Microsoft Desktop Optimization Pack. For more info about Advanced Group Policy Management, see [Advanced Group Policy Management Overview](https://go.microsoft.com/fwlink/p/?LinkId=145013) (https://go.microsoft.com/fwlink/p/?LinkId=145013).
->**Caution:** You should not edit an AppLocker rule collection while it is being enforced in Group Policy. Because AppLocker controls what files are allowed to run, making changes to a live policy can create unexpected behavior.
+> [!IMPORTANT]
+> You should not edit an AppLocker rule collection while it is being enforced in Group Policy. Because AppLocker controls what files are allowed to run, making changes to a live policy can create unexpected behavior.
**New version of a supported app**
@@ -143,103 +144,15 @@ The three key areas to determine for AppLocker policy management are:
The following table contains the added sample data that was collected when determining how to maintain and manage AppLocker policies.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Teller-East and Teller-West |
-Yes |
-Teller Software |
-C:\Program Files\Woodgrove\Teller.exe |
-File is signed; create a publisher condition |
-Allow |
-Tellers-AppLockerTellerRules |
-Web help |
-
-
- |
- |
- |
-Windows files
- |
-C:\Windows |
-Create a path exception to the default rule to exclude \Windows\Temp |
-Allow |
- |
-Help desk |
-
-
-Human Resources |
-HR-All |
-Yes |
-Check Payout |
-C:\Program Files\Woodgrove\HR\Checkcut.exe |
-File is signed; create a publisher condition |
-Allow |
-HR-AppLockerHRRules |
-Web help |
-
-
- |
- |
- |
-Time Sheet Organizer |
-C:\Program Files\Woodgrove\HR\Timesheet.exe |
-File is not signed; create a file hash condition |
-Allow |
- |
-Web help |
-
-
- |
- |
- |
-Internet Explorer 7 |
-C:\Program Files\Internet Explorer</p> |
-File is signed; create a publisher condition |
-Deny |
- |
-Web help
- |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-Use the default rule for the Windows path |
-Allow |
- |
-Help desk |
-
-
-
-
+|Business group|Organizational unit|Implement AppLocker?|Apps|Installation path|Use default rule or define new rule condition|Allow or deny|GPO name|Support policy|
+|--- |--- |--- |--- |--- |--- |--- |--- |--- |
+|Bank Tellers|Teller-East and Teller-West|Yes|Teller Software|C:\Program Files\Woodgrove\Teller.exe|File is signed; create a publisher condition|Allow|Tellers-AppLockerTellerRules|Web help|
+||||Windows files|C:\Windows|Create a path exception to the default rule to exclude \Windows\Temp|Allow||Help desk|
+|Human Resources|HR-All|Yes|Check Payout|C:\Program Files\Woodgrove\HR\Checkcut.exe|File is signed; create a publisher condition|Allow|HR-AppLockerHRRules|Web help|
+||||Time Sheet Organizer|C:\Program Files\Woodgrove\HR\Timesheet.exe|File is not signed; create a file hash condition|Allow||Web help|
+||||Internet Explorer 7|C:\Program Files\Internet Explorer|File is signed; create a publisher condition|Deny||Web help|
+||||Windows files|C:\Windows|Use the default rule for the Windows path|Allow||Help desk|
+
The following two tables illustrate examples of documenting considerations to maintain and manage AppLocker policies.
**Event processing policy**
@@ -248,83 +161,17 @@ One discovery method for app usage is to set the AppLocker enforcement mode to *
The following table is an example of what to consider and record.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Forwarded to: AppLocker Event Repository on srvBT093 |
-Standard |
-None |
-Standard |
-
-
-Human Resources |
-DO NOT FORWARD. srvHR004 |
-60 months |
-Yes, summary reports monthly to managers |
-Standard |
-
-
-
+|Business group|AppLocker event collection location|Archival policy|Analyzed?|Security policy|
+|--- |--- |--- |--- |--- |
+|Bank Tellers|Forwarded to: AppLocker Event Repository on srvBT093|Standard|None|Standard|
+|Human Resources|DO NOT FORWARD. srvHR004|60 months|Yes, summary reports monthly to managers|Standard|
Policy maintenance policy
When applications are identified and policies are created for application control, then you can begin documenting how you intend to update those policies.
The following table is an example of what to consider and record.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Planned: Monthly through business office triage
-Emergency: Request through help desk |
-Through business office triage
-30-day notice required |
-General policy: Keep past versions for 12 months
-List policies for each application |
-Coordinated through business office
-30-day notice required |
-
-
-Human Resources |
-Planned: Monthly through HR triage
-Emergency: Request through help desk |
-Through HR triage
-30-day notice required |
-General policy: Keep past versions for 60 months
-List policies for each application |
-Coordinated through HR
-30-day notice required |
-
-
-
\ No newline at end of file
+
+|Business group|Rule update policy|Application decommission policy|Application version policy|Application deployment policy|
+|--- |--- |--- |--- |--- |
+|Bank Tellers|Planned: Monthly through business office triageEmergency: Request through help desk|Through business office triage
30-day notice required|General policy: Keep past versions for 12 months
List policies for each application|Coordinated through business office
30-day notice required|
+|Human Resources|Planned: Monthly through HR triage
Emergency: Request through help desk|Through HR triage
30-day notice required|General policy: Keep past versions for 60 months
List policies for each application|Coordinated through HR
30-day notice required|
+
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/requirements-for-deploying-applocker-policies.md b/windows/security/threat-protection/windows-defender-application-control/applocker/requirements-for-deploying-applocker-policies.md
index 85f6eb11a3..4b22f44415 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/requirements-for-deploying-applocker-policies.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/requirements-for-deploying-applocker-policies.md
@@ -41,181 +41,28 @@ The following requirements must be met or addressed before you deploy your AppLo
An AppLocker policy deployment plan is the result of investigating which applications are required and necessary in your organization, which apps are optional, and which apps are forbidden. To develop this plan, see [AppLocker Design Guide](applocker-policies-design-guide.md). The following table is an example of the data you need to collect and the decisions you need to make to successfully deploy AppLocker policies on the supported operating systems (as listed in [Requirements to use AppLocker](requirements-to-use-applocker.md)).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Teller-East and Teller-West |
-Yes |
-Teller software |
-C:\Program Files\Woodgrove\Teller.exe |
-File is signed; create a publisher condition |
-Allow |
-Tellers |
-Web help |
-
-
- |
- |
- |
-Windows files
- |
-C:\Windows |
-Create a path exception to the default rule to exclude \Windows\Temp |
-Allow |
- |
-Help Desk |
-
-
- |
- |
- |
-Time Sheet Organizer |
-C:\Program Files\Woodgrove\HR\Timesheet.exe |
-File is not signed; create a file hash condition |
-Allow |
- |
-Web help |
-
-
-Human Resources |
-HR-All |
-Yes |
-Check Payout |
-C:\Program Files\Woodgrove\HR\Checkcut.exe |
-File is signed; create a publisher condition |
-Allow |
-HR |
-Web help |
-
-
- |
- |
- |
-Internet Explorer 7 |
-C:\Program Files\Internet Explorer</p> |
-File is signed; create a publisher condition |
-Deny |
- |
-Help Desk |
-
-
- |
- |
- |
-Windows files |
-C:\Windows |
-Use the default rule for the Windows path |
-Allow |
- |
-Help Desk |
-
-
-
+|Business group|Organizational unit|Implement AppLocker?|Apps|Installation path|Use default rule or define new rule condition|Allow or deny|GPO name|Support policy|
+|--- |--- |--- |--- |--- |--- |--- |--- |--- |
+|Bank Tellers|Teller-East and Teller-West|Yes|Teller software|C:\Program Files\Woodgrove\Teller.exe|File is signed; create a publisher condition|Allow|Tellers|Web help|
+||||Windows files|C:\Windows|Create a path exception to the default rule to exclude \Windows\Temp|Allow||Help Desk|
+||||Time Sheet Organizer|C:\Program Files\Woodgrove\HR\Timesheet.exe|File is not signed; create a file hash condition|Allow||Web help|
+|Human Resources|HR-All|Yes|Check Payout|C:\Program Files\Woodgrove\HR\Checkcut.exe|File is signed; create a publisher condition|Allow|HR|Web help|
+||||Internet Explorer 7|C:\Program Files\Internet Explorer|File is signed; create a publisher condition|Deny||Help Desk|
+||||Windows files|C:\Windows|Use the default rule for the Windows path|Allow||Help Desk|
Event processing policy
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Forwarded to: srvBT093 |
-Standard |
-None |
-Standard |
-
-
-Human Resources |
-Do not forward
- |
-60 months |
-Yes; summary reports monthly to managers |
-Standard |
-
-
-
+|Business group|AppLocker event collection location|Archival policy|Analyzed?|Security policy|
+|--- |--- |--- |--- |--- |
+|Bank Tellers|Forwarded to: srvBT093|Standard|None|Standard|
+|Human Resources|Do not forward|60 months|Yes; summary reports monthly to managers|Standard|
Policy maintenance policy
-
-
-
-
-
-
-
-
-
-
-
-
-
-Bank Tellers |
-Planned: Monthly through business office triage
-Emergency: Request through Help Desk |
-Through business office triage; 30-day notice required |
-General policy: Keep past versions for 12 months
-List policies for each application |
-Coordinated through business office; 30-day notice required |
-
-
-Human Resources |
-Planned: Through HR triage
-Emergency: Request through Help Desk |
-Through HR triage; 30-day notice required
- |
-General policy: Keep past versions for 60 months
-List policies for each application |
-Coordinated through HR; 30-day notice required |
-
-
-
+|Business group|Rule update policy|App decommission policy|App version policy|App deployment policy|
+|--- |--- |--- |--- |--- |
+|Bank Tellers|Planned: Monthly through business office triageEmergency: Request through Help Desk|Through business office triage; 30-day notice required|General policy: Keep past versions for 12 months
List policies for each application|Coordinated through business office; 30-day notice required|
+|Human Resources|Planned: Through HR triage
Emergency: Request through Help Desk|Through HR triage; 30-day notice required|General policy: Keep past versions for 60 months
List policies for each application|Coordinated through HR; 30-day notice required|
### Supported operating systems
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/understand-applocker-policy-design-decisions.md b/windows/security/threat-protection/windows-defender-application-control/applocker/understand-applocker-policy-design-decisions.md
index 2d5fca2ebb..c14abfaefc 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/understand-applocker-policy-design-decisions.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/understand-applocker-policy-design-decisions.md
@@ -57,7 +57,8 @@ You might need to control a limited number of apps because they access sensitive
| Control apps by computer, not user | AppLocker is a computer-based policy implementation. If your domain or site organizational structure is not based on a logical user structure, such as an OU, you might want to set up that structure before you begin your AppLocker planning. Otherwise, you will have to identify users, their computers, and their app access requirements.|
|Understand app usage, but there is no need to control any apps yet | AppLocker policies can be set to audit app usage to help you track which apps are used in your organization. You can then use the AppLocker event log to create AppLocker policies.|
->**Important:** The following list contains files or types of files that cannot be managed by AppLocker:
+> [!IMPORTANT]
+> The following list contains files or types of files that cannot be managed by AppLocker:
- AppLocker does not protect against running 16-bit DOS binaries in an NT Virtual DOS Machine (NTVDM). This technology allows running legacy DOS and 16-bit Windows programs on computers that are using Intel 80386 or higher when there is already another operating system running and controlling the hardware. The result is that 16-bit binaries can still run on Windows Server 2008 R2 and Windows 7 when AppLocker is configured to otherwise block binaries and libraries. If it is a requirement to prevent 16-bit applications from running, you must configure the Deny rule in the Executable rule collection for NTVDM.exe.
@@ -65,7 +66,8 @@ You might need to control a limited number of apps because they access sensitive
- AppLocker can only control VBScript, JScript, .bat files, .cmd files and Windows PowerShell scripts. It does not control all interpreted code that runs within a host process, for example Perl scripts and macros. Interpreted code is a form of executable code that runs within a host process. For example, Windows batch files (\*.bat) run within the context of the Windows Command Host (cmd.exe). To use AppLocker to control interpreted code, the host process must call AppLocker before it runs the interpreted code, and then enforce the decision that is returned by AppLocker. Not all host processes call into AppLocker. Therefore, AppLocker cannot control every kind of interpreted code, for example Microsoft Office macros.
- >**Important:** You should configure the appropriate security settings of these host processes if you must allow them to run. For example, configure the security settings in Microsoft Office to ensure that only signed and trusted macros are loaded.
+ > [!IMPORTANT]
+ > You should configure the appropriate security settings of these host processes if you must allow them to run. For example, configure the security settings in Microsoft Office to ensure that only signed and trusted macros are loaded.
- AppLocker rules allow or prevent an app from launching. AppLocker does not control the behavior of apps after they are launched. Applications could contain flags that are passed to functions that signal AppLocker to circumvent the rules and allow another .exe or .dll file to be loaded. In practice, an app that is allowed by AppLocker could use these flags to bypass AppLocker rules and launch child processes. You must follow a process that best suits your needs to thoroughly vet each app before allowing them to run using AppLocker rules.
@@ -98,57 +100,11 @@ Most organizations have evolved app control policies and methods over time. With
### Which Windows desktop and server operating systems are running in your organization?
If your organization supports multiple Windows operating systems, app control policy planning becomes more complex. Your initial design decisions should consider the security and management priorities of applications that are installed on each version of the operating system.
-
-
-
-
-
-
-
-
-
-
-Your organization's computers are running a combination of the following operating systems:
-
-Windows 11 Windows 10 Windows 8 Windows 7 Windows Vista Windows XP Windows Server 2012 Windows Server 2008 R2 Windows Server 2008 Windows Server 2003 |
-AppLocker rules are only applied to computers running the supported versions of Windows, but SRP rules can be applied to all versions of Windows beginning with Windows XP and Windows Server 2003. For specific operating system version requirements, see Requirements to use AppLocker.
-
- NoteIf you are using the Basic User security level as assigned in SRP, those privileges are not supported on computers running that support AppLocker.
-
-
-AppLocker policies as applied through a GPO take precedence over SRP policies in the same or linked GPO. SRP policies can be created and maintained the same way. |
-
-
-Your organization's computers are running only the following operating systems:
-
-Windows 11 Windows 10 Windows 8.1 Windows 8 Windows 7 Windows Server 2012 R2 Windows Server 2012 Windows Server 2008 R2 |
-Use AppLocker to create your application control policies. |
-
-
-
+|Possible answers|Design considerations|
+|--- |--- |
+|Your organization's computers are running a combination of the following operating systems: - Windows 11
- Windows 10
- Windows 8
- Windows 7
- Windows Vista
- Windows XP
- Windows Server 2012
- Windows Server 2008 R2
- Windows Server 2008
- Windows Server 2003|AppLocker rules are only applied to computers running the supported versions of Windows, but SRP rules can be applied to all versions of Windows beginning with Windows XP and Windows Server 2003. For specific operating system version requirements, see [Requirements to use AppLocker](requirements-to-use-applocker.md).
**Note:** If you are using the Basic User security level as assigned in SRP, those privileges are not supported on computers running that support AppLocker.
AppLocker policies as applied through a GPO take precedence over SRP policies in the same or linked GPO. SRP policies can be created and maintained the same way.|
+|Your organization's computers are running only the following operating systems: - Windows 11
- Windows 10
- Windows 8.1
- Windows 8
- Windows 7
- Windows Server 2012 R2
- Windows Server 2012
- Windows Server 2008 R2|Use AppLocker to create your application control policies.|
### Are there specific groups in your organization that need customized application control policies?
@@ -223,7 +179,7 @@ AppLocker is very effective for organizations that have application restriction
| Possible answers | Design considerations |
| - | - |
| Users run without administrative rights. | Apps are installed by using an installation deployment technology.|
-| AppLocker can help reduce the total cost of ownership for business groups that typically use a finite set of apps, such as human resources and finance departments. At the same time, these departments access highly sensitive information, much of which contains confidential and proprietary information. By using AppLocker to create rules for specific apps that are allowed to run, you can help limit unauthorized applications from accessing this information.
**Note: **AppLocker can also be effective in helping create standardized desktops in organizations where users run as administrators. However, it is important to note that users with administrative credentials can add new rules to the local AppLocker policy.| Users must be able to install applications as needed.
+| AppLocker can help reduce the total cost of ownership for business groups that typically use a finite set of apps, such as human resources and finance departments. At the same time, these departments access highly sensitive information, much of which contains confidential and proprietary information. By using AppLocker to create rules for specific apps that are allowed to run, you can help limit unauthorized applications from accessing this information.
**Note:** AppLocker can also be effective in helping create standardized desktops in organizations where users run as administrators. However, it is important to note that users with administrative credentials can add new rules to the local AppLocker policy.| Users must be able to install applications as needed.
| Users currently have administrator access, and it would be difficult to change this.|Enforcing AppLocker rules is not suited for business groups that must be able to install apps as needed and without approval from the IT department. If one or more OUs in your organization has this requirement, you can choose not to enforce application rules in those OUs by using AppLocker or to implement the **Audit only** enforcement setting through AppLocker.|
### Is the structure in Active Directory Domain Services based on the organization's hierarchy?
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-path-rule-condition-in-applocker.md b/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-path-rule-condition-in-applocker.md
index 0eb3e887ba..4aa28b9f43 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-path-rule-condition-in-applocker.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-path-rule-condition-in-applocker.md
@@ -35,30 +35,9 @@ The path condition identifies an application by its location in the file system
When creating a rule that uses a deny action, path conditions are less secure than publisher and file hash conditions for preventing access to a file because a user could easily copy the file to a different location than the location specified in the rule. Because path rules specify locations within the file system, you should ensure that there are no subdirectories that are writable by non-administrators. For example, if you create a path rule for C:\\ with the allow action, any file under that location will be allowed to run, including within users' profiles. The following table describes the advantages and disadvantages of the path condition.
-
-
-
-
-
-
-
-
-
-
- |
-
-It might be less secure if a rule that is configured to use a folder path contains subfolders that are writable by non-administrators. You must specify the full path to a file or folder when creating path rules so that the rule will be properly enforced. |
-
-
-
+|Path condition advantages|Path condition disadvantages|
+|--- |--- |
+| - You can easily control many folders or a single file.
- You can use the asterisk (*) as a wildcard character within path rules.|
- It might be less secure if a rule that is configured to use a folder path contains subfolders that are writable by non-administrators.
- You must specify the full path to a file or folder when creating path rules so that the rule will be properly enforced.|
AppLocker does not enforce rules that specify paths with short names. You should always specify the full path to a file or folder when creating path rules so that the rule will be properly enforced.
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-publisher-rule-condition-in-applocker.md b/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-publisher-rule-condition-in-applocker.md
index 86cc3ed874..55d9299a0f 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-publisher-rule-condition-in-applocker.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/understanding-the-publisher-rule-condition-in-applocker.md
@@ -35,32 +35,9 @@ Publisher conditions can be made only for files that are digitally signed; this
Publisher conditions are easier to maintain than file hash conditions and are generally more secure than path conditions. Rules that are specified to the version level might have to be updated when a new version of the file is released. The following table describes the advantages and disadvantages
of the publisher condition.
-
-
-
-
-
-
-
-
-
-
-
-Frequent updating is not required. You can apply different values within a certificate. A single rule can be used to allow an entire product suite. You can use the asterisk (*) wildcard character within a publisher rule to specify that any value should be matched. |
- |
-
-
-
+|Publisher condition advantages|Publisher condition disadvantages|
+|--- |--- |
+| - Frequent updating is not required.
- You can apply different values within a certificate.
- A single rule can be used to allow an entire product suite.
- You can use the asterisk (*) wildcard character within a publisher rule to specify that any value should be matched.|
- The file must be signed.
- Although a single rule can be used to allow an entire product suite, all files in the suite must be signed uniformly.|
Wildcard characters can be used as values in the publisher rule fields according to the following specifications:
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/use-applocker-and-software-restriction-policies-in-the-same-domain.md b/windows/security/threat-protection/windows-defender-application-control/applocker/use-applocker-and-software-restriction-policies-in-the-same-domain.md
index a22f94b741..40d68279fe 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/use-applocker-and-software-restriction-policies-in-the-same-domain.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/use-applocker-and-software-restriction-policies-in-the-same-domain.md
@@ -38,139 +38,22 @@ Windows Server 2008 R2, Windows 7 and later. It is recommended that you auth
Windows 7 and later, the SRP policies are ignored.
The following table compares the features and functions of Software Restriction Policies (SRP) and AppLocker.
-
-
-
-
-
-
-
-
-
-
-
-Scope |
-SRP policies can be applied to all Windows operating systems beginning with Windows XP and Windows Server 2003. |
-AppLocker policies apply only to Windows Server 2008 R2, Windows 7, and later. |
-
-
-Policy creation |
-SRP policies are maintained through Group Policy and only the administrator of the GPO can update the SRP policy. The administrator on the local computer can modify the SRP policies defined in the local GPO. |
-AppLocker policies are maintained through Group Policy and only the administrator of the GPO can update the policy. The administrator on the local computer can modify the AppLocker policies defined in the local GPO.
-AppLocker permits customization of error messages to direct users to a Web page for help. |
-
-
-Policy maintenance |
-SRP policies must be updated by using the Local Security Policy snap-in (if the policies are created locally) or the Group Policy Management Console (GPMC). |
-AppLocker policies can be updated by using the Local Security Policy snap-in (if the policies are created locally), or the GPMC, or the Windows PowerShell AppLocker cmdlets. |
-
-
-Policy application |
-SRP policies are distributed through Group Policy. |
-AppLocker policies are distributed through Group Policy. |
-
-
-Enforcement mode |
-SRP works in the “deny list mode” where administrators can create rules for files that they do not want to allow in this Enterprise whereas the rest of the file is allowed to run by default.
-SRP can also be configured in the “allowlist mode” so that by default all files are blocked and administrators need to create allow rules for files that they want to allow. |
-AppLocker by default works in the “allowlist mode” where only those files are allowed to run for which there is a matching allow rule. |
-
-
-File types that can be controlled |
-SRP can control the following file types:
-
-Executables Dlls Scripts Windows Installers
-SRP cannot control each file type separately. All SRP rules are in a single rule collection. |
-AppLocker can control the following file types:
-
-AppLocker maintains a separate rule collection for each of the five file types. |
-
-
-Designated file types |
-SRP supports an extensible list of file types that are considered executable. Administrators can add extensions for files that should be considered executable. |
-AppLocker currently supports the following file extensions:
-
-Executables (.exe, .com) Dlls (.ocx, .dll) Scripts (.vbs, .js, .ps1, .cmd, .bat) Windows Installers (.msi, .mst, .msp) Packaged app installers (.appx) |
-
-
-Rule types |
-SRP supports four types of rules:
-
-Hash Path Signature Internet zone |
-AppLocker supports three types of rules:
-
-File hash Path Publisher |
-
-
-Editing the hash value |
-In Windows XP, you could use SRP to provide custom hash values.
-Beginning with Windows 7 and Windows Server 2008 R2, you can only select the file to hash, not provide the hash value. |
-AppLocker computes the hash value itself. Internally, it uses the SHA2 Authenticode hash for Portable Executables (exe and dll) and Windows Installers and an SHA2 flat file hash for the rest. |
-
-
-Support for different security levels |
-With SRP, you can specify the permissions with which an app can run. So, you can configure a rule such that Notepad always runs with restricted permissions and never with administrative privileges.
-SRP on Windows Vista and earlier supported multiple security levels. On Windows 7, that list was restricted to just two levels: Disallowed and Unrestricted (Basic User translates to Disallowed). |
-AppLocker does not support security levels. |
-
-
-Manage Packaged apps and Packaged app installers. |
-Not supported |
-.appx is a valid file type which AppLocker can manage. |
-
-
-Targeting a rule to a user or a group of users |
-SRP rules apply to all users on a particular computer. |
-AppLocker rules can be targeted to a specific user or a group of users. |
-
-
-Support for rule exceptions |
-SRP does not support rule exceptions. |
-AppLocker rules can have exceptions, which allow you to create rules such as “Allow everything from Windows except for regedit.exe”. |
-
-
-Support for audit mode |
-SRP does not support audit mode. The only way to test SRP policies is to set up a test environment and run a few experiments. |
-AppLocker supports audit mode, which allows you to test the effect of their policy in the real production environment without impacting the user experience. Once you are satisfied with the results, you can start enforcing the policy. |
-
-
-Support for exporting and importing policies |
-SRP does not support policy import/export. |
-AppLocker supports the importing and exporting of policies. This allows you to create AppLocker policy on a sample device, test it out and then export that policy and import it back into the desired GPO. |
-
-
-Rule enforcement |
-Internally, SRP rules enforcement happens in the user-mode, which is less secure. |
-Internally, AppLocker rules for .exe and .dll files are enforced in the kernel-mode, which is more secure than enforcing them in the user-mode. |
-
-
-
-
-
-
+
+|Application control function|SRP|AppLocker|
+|--- |--- |--- |
+|Scope|SRP policies can be applied to all Windows operating systems beginning with Windows XP and Windows Server 2003.|AppLocker policies apply only to Windows Server 2008 R2, Windows 7, and later.|
+|Policy creation|SRP policies are maintained through Group Policy and only the administrator of the GPO can update the SRP policy. The administrator on the local computer can modify the SRP policies defined in the local GPO.|AppLocker policies are maintained through Group Policy and only the administrator of the GPO can update the policy. The administrator on the local computer can modify the AppLocker policies defined in the local GPO.
AppLocker permits customization of error messages to direct users to a Web page for help.|
+|Policy maintenance|SRP policies must be updated by using the Local Security Policy snap-in (if the policies are created locally) or the Group Policy Management Console (GPMC).|AppLocker policies can be updated by using the Local Security Policy snap-in (if the policies are created locally), or the GPMC, or the Windows PowerShell AppLocker cmdlets.|
+|Policy application|SRP policies are distributed through Group Policy.|AppLocker policies are distributed through Group Policy.|
+|Enforcement mode|SRP works in the “deny list mode” where administrators can create rules for files that they do not want to allow in this Enterprise whereas the rest of the file is allowed to run by default.
SRP can also be configured in the “allowlist mode” so that by default all files are blocked and administrators need to create allow rules for files that they want to allow.|AppLocker by default works in the “allowlist mode” where only those files are allowed to run for which there is a matching allow rule.|
+|File types that can be controlled|SRP can control the following file types: - Executables
- Dlls
- Scripts
- Windows Installers
SRP cannot control each file type separately. All SRP rules are in a single rule collection.|AppLocker can control the following file types: - Executables
- Dlls
- Scripts
- Windows Installers
- Packaged apps and installers
AppLocker maintains a separate rule collection for each of the five file types.|
+|Designated file types|SRP supports an extensible list of file types that are considered executable. Administrators can add extensions for files that should be considered executable.|AppLocker currently supports the following file extensions: - Executables (.exe, .com)
- Dlls (.ocx, .dll)
- Scripts (.vbs, .js, .ps1, .cmd, .bat)
- Windows Installers (.msi, .mst, .msp)
- Packaged app installers (.appx)|
+|Rule types|SRP supports four types of rules:
- Hash
- Path
- Signature
- Internet zone|AppLocker supports three types of rules:
- File hash
- Path
- Publisher|
+|Editing the hash value|In Windows XP, you could use SRP to provide custom hash values.
Beginning with Windows 7 and Windows Server 2008 R2, you can only select the file to hash, not provide the hash value.|AppLocker computes the hash value itself. Internally, it uses the SHA2 Authenticode hash for Portable Executables (exe and dll) and Windows Installers and an SHA2 flat file hash for the rest.|
+|Support for different security levels|With SRP, you can specify the permissions with which an app can run. So, you can configure a rule such that Notepad always runs with restricted permissions and never with administrative privileges.
SRP on Windows Vista and earlier supported multiple security levels. On Windows 7, that list was restricted to just two levels: Disallowed and Unrestricted (Basic User translates to Disallowed).|AppLocker does not support security levels.|
+|Manage Packaged apps and Packaged app installers.|Not supported|.appx is a valid file type which AppLocker can manage.|
+|Targeting a rule to a user or a group of users|SRP rules apply to all users on a particular computer.|AppLocker rules can be targeted to a specific user or a group of users.|
+|Support for rule exceptions|SRP does not support rule exceptions.|AppLocker rules can have exceptions, which allow you to create rules such as “Allow everything from Windows except for regedit.exe”.|
+|Support for audit mode|SRP does not support audit mode. The only way to test SRP policies is to set up a test environment and run a few experiments.|AppLocker supports audit mode, which allows you to test the effect of their policy in the real production environment without impacting the user experience. Once you are satisfied with the results, you can start enforcing the policy.|
+|Support for exporting and importing policies|SRP does not support policy import/export.|AppLocker supports the importing and exporting of policies. This allows you to create AppLocker policy on a sample device, test it out and then export that policy and import it back into the desired GPO.|
+|Rule enforcement|Internally, SRP rules enforcement happens in the user-mode, which is less secure.|Internally, AppLocker rules for .exe and .dll files are enforced in the kernel-mode, which is more secure than enforcing them in the user-mode.|
diff --git a/windows/security/threat-protection/windows-defender-application-control/applocker/what-is-applocker.md b/windows/security/threat-protection/windows-defender-application-control/applocker/what-is-applocker.md
index 3629a929f5..1196a83dee 100644
--- a/windows/security/threat-protection/windows-defender-application-control/applocker/what-is-applocker.md
+++ b/windows/security/threat-protection/windows-defender-application-control/applocker/what-is-applocker.md
@@ -53,145 +53,33 @@ For information about the application control scenarios that AppLocker addresses
The following table compares AppLocker to Software Restriction Policies.
-
-
-
-
-
-
-
-
-
-
-
-Rule scope |
-All users |
-Specific user or group |
-
-
-Rule conditions provided |
-File hash, path, certificate, registry path, and Internet zone |
-File hash, path, and publisher |
-
-
-Rule types provided |
-Defined by the security levels:
-
-Disallowed Basic User Unrestricted |
-Allow and deny |
-
-
-Default rule action |
-Unrestricted |
-Implicit deny |
-
-
-Audit-only mode |
-No |
-Yes |
-
-
-Wizard to create multiple rules at one time |
-No |
-Yes |
-
-
-Policy import or export |
-No |
-Yes |
-
-
-Rule collection |
-No |
-Yes |
-
-
-Windows PowerShell support |
-No |
-Yes |
-
-
-Custom error messages |
-No |
-Yes |
-
-
-
+|Feature|Software Restriction Policies|AppLocker|
+|--- |--- |--- |
+|Rule scope|All users|Specific user or group|
+|Rule conditions provided|File hash, path, certificate, registry path, and Internet zone|File hash, path, and publisher|
+|Rule types provided|Defined by the security levels: - Disallowed
- Basic User
- Unrestricted|Allow and deny|
+|Default rule action|Unrestricted|Implicit deny|
+|Audit-only mode|No|Yes|
+|Wizard to create multiple rules at one time|No|Yes|
+|Policy import or export|No|Yes|
+|Rule collection|No|Yes|
+|Windows PowerShell support|No|Yes|
+|Custom error messages|No|Yes|
Application control function differences
The following table compares the application control functions of Software Restriction Policies (SRP) and AppLocker.
-
-
-
-
-
-
-
-
-
-
-
-Operating system scope |
-SRP policies can be applied to all Windows operating systems beginning with Windows XP and Windows Server 2003. |
-AppLocker policies apply only to those supported operating system versions and editions listed in Requirements to use AppLocker. But these systems can also use SRP.
-
- NoteUse different GPOs for SRP and AppLocker rules.
-
- |
-
-
-User support |
-SRP allows users to install applications as an administrator. |
-AppLocker policies are maintained through Group Policy, and only the administrator of the device can update an AppLocker policy.
-AppLocker permits customization of error messages to direct users to a Web page for help. |
-
-
-Policy maintenance |
-SRP policies are updated by using the Local Security Policy snap-in or the Group Policy Management Console (GPMC). |
-AppLocker policies are updated by using the Local Security Policy snap-in or the GPMC.
-AppLocker supports a small set of PowerShell cmdlets to aid in administration and maintenance. |
-
-
-Policy management infrastructure |
-To manage SRP policies, SRP uses Group Policy within a domain and the Local Security Policy snap-in for a local computer. |
-To manage AppLocker policies, AppLocker uses Group Policy within a domain and the Local Security Policy snap-in for a local computer. |
-
-
-Block malicious scripts |
-Rules for blocking malicious scripts prevents all scripts associated with the Windows Script Host from running, except those that are digitally signed by your organization. |
-AppLocker rules can control the following file formats: .ps1, .bat, .cmd, .vbs, and .js. In addition, you can set exceptions to allow specific files to run. |
-
-
-Manage software installation |
-SRP can prevent all Windows Installer packages from installing. It allows .msi files that are digitally signed by your organization to be installed. |
-The Windows Installer rule collection is a set of rules created for Windows Installer file types (.mst, .msi and .msp) to allow you to control the installation of files on client computers and servers. |
-
-
-Manage all software on the computer |
-All software is managed in one rule set. By default, the policy for managing all software on a device disallows all software on the user's device, except software that is installed in the Windows folder, Program Files folder, or subfolders. |
-Unlike SRP, each AppLocker rule collection functions as an allowed list of files. Only the files that are listed within the rule collection will be allowed to run. This configuration makes it easier for administrators to determine what will occur when an AppLocker rule is applied. |
-
-
-Different policies for different users |
-Rules are applied uniformly to all users on a particular device. |
-On a device that is shared by multiple users, an administrator can specify the groups of users who can access the installed software. Using AppLocker, an administrator can specify the user to whom a specific rule should apply. |
-
-
-
+|Application control function|SRP|AppLocker|
+|--- |--- |--- |
+|Operating system scope|SRP policies can be applied to all Windows operating systems beginning with Windows XP and Windows Server 2003.|AppLocker policies apply only to those supported operating system versions and editions listed in [Requirements to use AppLocker](requirements-to-use-applocker.md). But these systems can also use SRP.**Note:** Use different GPOs for SRP and AppLocker rules.
|
+|User support|SRP allows users to install applications as an administrator.|AppLocker policies are maintained through Group Policy, and only the administrator of the device can update an AppLocker policy.AppLocker permits customization of error messages to direct users to a Web page for help.|
+|Policy maintenance|SRP policies are updated by using the Local Security Policy snap-in or the Group Policy Management Console (GPMC).|AppLocker policies are updated by using the Local Security Policy snap-in or the GPMC.
AppLocker supports a small set of PowerShell cmdlets to aid in administration and maintenance.|
+|Policy management infrastructure|To manage SRP policies, SRP uses Group Policy within a domain and the Local Security Policy snap-in for a local computer.|To manage AppLocker policies, AppLocker uses Group Policy within a domain and the Local Security Policy snap-in for a local computer.|
+|Block malicious scripts|Rules for blocking malicious scripts prevents all scripts associated with the Windows Script Host from running, except those that are digitally signed by your organization.|AppLocker rules can control the following file formats: .ps1, .bat, .cmd, .vbs, and .js. In addition, you can set exceptions to allow specific files to run.|
+|Manage software installation|SRP can prevent all Windows Installer packages from installing. It allows .msi files that are digitally signed by your organization to be installed.|The Windows Installer rule collection is a set of rules created for Windows Installer file types (.mst, .msi and .msp) to allow you to control the installation of files on client computers and servers.|
+|Manage all software on the computer|All software is managed in one rule set. By default, the policy for managing all software on a device disallows all software on the user's device, except software that is installed in the Windows folder, Program Files folder, or subfolders.|Unlike SRP, each AppLocker rule collection functions as an allowed list of files. Only the files that are listed within the rule collection will be allowed to run. This configuration makes it easier for administrators to determine what will occur when an AppLocker rule is applied.|
+|Different policies for different users|Rules are applied uniformly to all users on a particular device.|On a device that is shared by multiple users, an administrator can specify the groups of users who can access the installed software. Using AppLocker, an administrator can specify the user to whom a specific rule should apply.|
## Related topics
diff --git a/windows/whats-new/windows-10-insider-preview.md b/windows/whats-new/windows-10-insider-preview.md
index 6fd107bf08..2e6f2191f7 100644
--- a/windows/whats-new/windows-10-insider-preview.md
+++ b/windows/whats-new/windows-10-insider-preview.md
@@ -14,7 +14,8 @@ ms.topic: article
# Documentation for Windows 10 Insider Preview
-> [Some information relates to pre-released product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here. ]
+>[!NOTE]
+> Some information relates to pre-released product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
This section contains preliminary documentation for some enterprise features in Windows 10 Insider Preview. Information in this section may change frequently.
-
