mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-05-13 13:57:22 +00:00
Merge branch 'master' into vs-diagnosticdataviewer
This commit is contained in:
Elizabeth Ross
commit
a2badb566c
@ -6,8 +6,8 @@
|
||||
"redirect_document_id": true
|
||||
},
|
||||
{
|
||||
"source_path": "windows/devices/surface/surface-device-compatibility-with-windows-10-ltsb.md",
|
||||
"redirect_url": "/windows/devices/surface/surface-device-compatibility-with-windows-10-ltsc",
|
||||
"source_path": "devices/surface/surface-device-compatibility-with-windows-10-ltsb.md",
|
||||
"redirect_url": "/devices/surface/surface-device-compatibility-with-windows-10-ltsc",
|
||||
"redirect_document_id": true
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# [Surface](index.md)
|
||||
## [Deploy Surface devices](deploy.md)
|
||||
### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md)
|
||||
### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsc.md)
|
||||
#### [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md)
|
||||
### [Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md)
|
||||
### [Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)
|
||||
|
||||
@ -57,7 +57,7 @@ New or changed topic | Description
|
||||
|
||||
|New or changed topic | Description |
|
||||
| --- | --- |
|
||||
|[Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md) | New (supersedes [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md))|
|
||||
|[Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsc.md) | New (supersedes [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md))|
|
||||
|
||||
|
||||
## January 2017
|
||||
|
||||
@ -17,7 +17,7 @@ Get deployment guidance for your Surface devices including information about MDT
|
||||
|
||||
| Topic | Description |
|
||||
| --- | --- |
|
||||
| [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md) | Find out about compatibility and limitations of Surface devices running Windows 10 Enterprise LTSB edition. |
|
||||
| [Surface device compatibility with Windows 10 Long-Term Servicing Channel](surface-device-compatibility-with-windows-10-ltsc.md) | Find out about compatibility and limitations of Surface devices running Windows 10 Enterprise LTSB edition. |
|
||||
| [Deploy Windows 10 to Surface devices with MDT](deploy-windows-10-to-surface-devices-with-mdt.md) | Walk through the recommended process of how to deploy Windows 10 to your Surface devices with the Microsoft Deployment Toolkit.|
|
||||
| [Upgrade Surface devices to Windows 10 with MDT](upgrade-surface-devices-to-windows-10-with-mdt.md)| Find out how to perform a Windows 10 upgrade deployment to your Surface devices. |
|
||||
| [Customize the OOBE for Surface deployments](customize-the-oobe-for-surface-deployments.md)| Walk through the process of customizing the Surface out-of-box experience for end users in your organization.|
|
||||
|
||||
@ -12,7 +12,7 @@ ms.date: 04/25/2017
|
||||
# Long-Term Servicing Branch (LTSB) for Surface devices
|
||||
|
||||
>[!WARNING]
|
||||
>For updated information on this topic, see [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsb.md). For additional information on this update, see the [Documentation Updates for Surface and Windows 10 LTSB Compatibility](https://blogs.technet.microsoft.com/surface/2017/04/11/documentation-updates-for-surface-and-windows-10-ltsb-compatibility) post on the Surface Blog for IT Pros.
|
||||
>For updated information on this topic, see [Surface device compatibility with Windows 10 Long-Term Servicing Channel](surface-device-compatibility-with-windows-10-ltsc.md). For additional information on this update, see the [Documentation Updates for Surface and Windows 10 LTSB Compatibility](https://blogs.technet.microsoft.com/surface/2017/04/11/documentation-updates-for-surface-and-windows-10-ltsb-compatibility) post on the Surface Blog for IT Pros.
|
||||
|
||||
General-purpose Surface devices running Long-Term Servicing Branch (LTSB) are not supported. As a general guideline, if a Surface device runs productivity software, such as Microsoft Office, it is a general-purpose device that does not qualify for LTSB and should instead run Current Branch (CB) or Current Branch for Business (CBB).
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -794,9 +794,6 @@ The following diagram shows the Policy configuration service provider in tree fo
|
||||
<dd>
|
||||
<a href="./policy-csp-deliveryoptimization.md#deliveryoptimization-doallowvpnpeercaching" id="deliveryoptimization-doallowvpnpeercaching">DeliveryOptimization/DOAllowVPNPeerCaching</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-deliveryoptimization.md#deliveryoptimization-docachehost" id="deliveryoptimization-docachehost">DeliveryOptimization/DOCacheHost</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-deliveryoptimization.md#deliveryoptimization-dodelaybackgrounddownloadfromhttp" id="deliveryoptimization-dodelaybackgrounddownloadfromhttp">DeliveryOptimization/DODelayBackgroundDownloadFromHttp</a>
|
||||
</dd>
|
||||
@ -2758,12 +2755,18 @@ The following diagram shows the Policy configuration service provider in tree fo
|
||||
<dd>
|
||||
<a href="./policy-csp-system.md#system-bootstartdriverinitialization" id="system-bootstartdriverinitialization">System/BootStartDriverInitialization</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-system.md#system-disableenterpriseauthproxy" id="system-disableenterpriseauthproxy">System/DisableEnterpriseAuthProxy</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-system.md#system-disableonedrivefilesync" id="system-disableonedrivefilesync">System/DisableOneDriveFileSync</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-system.md#system-disablesystemrestore" id="system-disablesystemrestore">System/DisableSystemRestore</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-system.md#system-feedbackhubalwayssavediagnosticslocally" id="system-feedbackhubalwayssavediagnosticslocally">System/FeedbackHubAlwaysSaveDiagnosticsLocally</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="./policy-csp-system.md#system-limitenhanceddiagnosticdatawindowsanalytics" id="system-limitenhanceddiagnosticdatawindowsanalytics">System/LimitEnhancedDiagnosticDataWindowsAnalytics</a>
|
||||
</dd>
|
||||
|
||||
@ -27,9 +27,6 @@ ms.date: 01/03/2018
|
||||
<dd>
|
||||
<a href="#deliveryoptimization-doallowvpnpeercaching">DeliveryOptimization/DOAllowVPNPeerCaching</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#deliveryoptimization-docachehost">DeliveryOptimization/DOCacheHost</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#deliveryoptimization-dodelaybackgrounddownloadfromhttp">DeliveryOptimization/DODelayBackgroundDownloadFromHttp</a>
|
||||
</dd>
|
||||
@ -199,55 +196,6 @@ The following list shows the supported values:
|
||||
<!--EndPolicy-->
|
||||
<hr/>
|
||||
<!--StartPolicy-->
|
||||
<a href="" id="deliveryoptimization-docachehost"></a>**DeliveryOptimization/DOCacheHost**
|
||||
|
||||
<!--StartSKU-->
|
||||
<table>
|
||||
<tr>
|
||||
<th>Home</th>
|
||||
<th>Pro</th>
|
||||
<th>Business</th>
|
||||
<th>Enterprise</th>
|
||||
<th>Education</th>
|
||||
<th>Mobile</th>
|
||||
<th>Mobile Enterprise</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="images/crossmark.png" alt="cross mark" /></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/crossmark.png" alt="cross mark" /></td>
|
||||
<td><img src="images/crossmark.png" alt="cross mark" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<!--EndSKU-->
|
||||
<!--StartScope-->
|
||||
[Scope](./policy-configuration-service-provider.md#policy-scope):
|
||||
|
||||
> [!div class = "checklist"]
|
||||
> * Device
|
||||
|
||||
<hr/>
|
||||
|
||||
<!--EndScope-->
|
||||
<!--StartDescription-->
|
||||
Added in Windows 10, next major update. TBD
|
||||
<!--EndDescription-->
|
||||
<!--SupportedValues-->
|
||||
|
||||
<!--/SupportedValues-->
|
||||
<!--Example-->
|
||||
|
||||
<!--/Example-->
|
||||
<!--Validation-->
|
||||
|
||||
<!--/Validation-->
|
||||
<!--EndPolicy-->
|
||||
<hr/>
|
||||
<!--StartPolicy-->
|
||||
<a href="" id="deliveryoptimization-dodelaybackgrounddownloadfromhttp"></a>**DeliveryOptimization/DODelayBackgroundDownloadFromHttp**
|
||||
|
||||
<!--StartSKU-->
|
||||
|
||||
@ -6,11 +6,13 @@ ms.topic: article
|
||||
ms.prod: w10
|
||||
ms.technology: windows
|
||||
author: nickbrower
|
||||
ms.date: 12/14/2017
|
||||
ms.date: 12/19/2017
|
||||
---
|
||||
|
||||
# Policy CSP - System
|
||||
|
||||
> [!WARNING]
|
||||
> Some information relates to prereleased 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.
|
||||
|
||||
|
||||
<hr/>
|
||||
@ -46,12 +48,18 @@ ms.date: 12/14/2017
|
||||
<dd>
|
||||
<a href="#system-bootstartdriverinitialization">System/BootStartDriverInitialization</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#system-disableenterpriseauthproxy">System/DisableEnterpriseAuthProxy</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#system-disableonedrivefilesync">System/DisableOneDriveFileSync</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#system-disablesystemrestore">System/DisableSystemRestore</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#system-feedbackhubalwayssavediagnosticslocally">System/FeedbackHubAlwaysSaveDiagnosticsLocally</a>
|
||||
</dd>
|
||||
<dd>
|
||||
<a href="#system-limitenhanceddiagnosticdatawindowsanalytics">System/LimitEnhancedDiagnosticDataWindowsAnalytics</a>
|
||||
</dd>
|
||||
@ -603,6 +611,50 @@ ADMX Info:
|
||||
<!--EndPolicy-->
|
||||
<hr/>
|
||||
<!--StartPolicy-->
|
||||
<a href="" id="system-disableenterpriseauthproxy"></a>**System/DisableEnterpriseAuthProxy**
|
||||
|
||||
<!--StartSKU-->
|
||||
<table>
|
||||
<tr>
|
||||
<th>Home</th>
|
||||
<th>Pro</th>
|
||||
<th>Business</th>
|
||||
<th>Enterprise</th>
|
||||
<th>Education</th>
|
||||
<th>Mobile</th>
|
||||
<th>Mobile Enterprise</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="images/crossmark.png" alt="cross mark" /></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>3</sup></td>
|
||||
<td><img src="images/crossmark.png" alt="cross mark" /></td>
|
||||
<td><img src="images/crossmark.png" alt="cross mark" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<!--EndSKU-->
|
||||
<!--StartScope-->
|
||||
[Scope](./policy-configuration-service-provider.md#policy-scope):
|
||||
|
||||
> [!div class = "checklist"]
|
||||
> * Device
|
||||
|
||||
<hr/>
|
||||
|
||||
<!--EndScope-->
|
||||
<!--StartDescription-->
|
||||
This policy setting blocks the Connected User Experience and Telemetry service from automatically using an authenticated proxy to send data back to Microsoft on Windows 10. If you disable or do not configure this policy setting, the Connected User Experience and Telemetry service will automatically use an authenticated proxy to send data back to Microsoft. Enabling this policy will block the Connected User Experience and Telemetry service from automatically using an authenticated proxy.
|
||||
|
||||
<!--EndDescription-->
|
||||
<!--SupportedValues-->
|
||||
|
||||
<!--/SupportedValues-->
|
||||
<!--EndPolicy-->
|
||||
<hr/>
|
||||
<!--StartPolicy-->
|
||||
<a href="" id="system-disableonedrivefilesync"></a>**System/DisableOneDriveFileSync**
|
||||
|
||||
<!--StartSKU-->
|
||||
@ -731,6 +783,56 @@ ADMX Info:
|
||||
<!--EndPolicy-->
|
||||
<hr/>
|
||||
<!--StartPolicy-->
|
||||
<a href="" id="system-feedbackhubalwayssavediagnosticslocally"></a>**System/FeedbackHubAlwaysSaveDiagnosticsLocally**
|
||||
|
||||
<!--StartSKU-->
|
||||
<table>
|
||||
<tr>
|
||||
<th>Home</th>
|
||||
<th>Pro</th>
|
||||
<th>Business</th>
|
||||
<th>Enterprise</th>
|
||||
<th>Education</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<!--EndSKU-->
|
||||
<!--StartScope-->
|
||||
[Scope](./policy-configuration-service-provider.md#policy-scope):
|
||||
|
||||
> [!div class = "checklist"]
|
||||
> * Device
|
||||
|
||||
<hr/>
|
||||
|
||||
<!--EndScope-->
|
||||
<!--StartDescription-->
|
||||
Added in Windows 10, next major update. When filing feedback in the Feedback Hub, diagnostic logs are collected for certain types of feedback. We now offer the option for users to save it locally, in addition to sending it to Microsoft. This policy will allow enterprises to mandate that all diagnostics are saved locally for use in internal investigations.
|
||||
|
||||
<!--EndDescription-->
|
||||
<!--SupportedValues-->
|
||||
The following list shows the supported values:
|
||||
|
||||
- 0 (default) - False. The Feedback Hub will not always save a local copy of diagnostics that may be created when a feedback is submitted. The user will have the option to do so.
|
||||
- 1 - True. The Feedback Hub should always save a local copy of diagnostics that may be created when a feedback is submitted.
|
||||
|
||||
<!--/SupportedValues-->
|
||||
<!--Example-->
|
||||
|
||||
<!--/Example-->
|
||||
<!--Validation-->
|
||||
|
||||
<!--/Validation-->
|
||||
<!--EndPolicy-->
|
||||
<hr/>
|
||||
<!--StartPolicy-->
|
||||
<a href="" id="system-limitenhanceddiagnosticdatawindowsanalytics"></a>**System/LimitEnhancedDiagnosticDataWindowsAnalytics**
|
||||
|
||||
<!--StartSKU-->
|
||||
|
||||
@ -19,6 +19,7 @@ This topic lists new and updated topics in the [Configure Windows 10](index.md)
|
||||
|
||||
New or changed topic | Description
|
||||
--- | ---
|
||||
[ConnectivityProfiles](wcd/wcd-connectivityprofiles.md) | Added settings for VPN **Native** and **Third Party** profile types.
|
||||
[Start layout XML for desktop editions of Windows 10 (reference)](start-layout-xml-desktop.md) | Clarified that the TopMFUApps elements in layoutmodification.xml are not supported in Windows 10, version 1709.
|
||||
|
||||
## November 2017
|
||||
|
||||
@ -7,7 +7,7 @@ ms.sitesec: library
|
||||
author: jdeckerMS
|
||||
ms.localizationpriority: medium
|
||||
ms.author: jdecker
|
||||
ms.date: 09/06/2017
|
||||
ms.date: 01/10/2018
|
||||
---
|
||||
|
||||
# ConnectivityProfiles (Windows Configuration Designer reference)
|
||||
@ -114,15 +114,33 @@ Configure settings to change the default maximum transmission unit ([MTU](#mtu))
|
||||
| Setting | Description |
|
||||
| --- | --- |
|
||||
| **ProfileType** | Choose between **Native** and **Third Party** |
|
||||
| RememberCredentials | Select whether credentials should be cached |
|
||||
| AlwaysOn | Set to **True** to automatically connect the VPN at sign-in |
|
||||
| LockDown | When set to **True**:</br>- Profile automatically becomes an "always on" profile</br>- VPN cannot be disconnected</br>-If the profile is not connected, the user has no network connectivity</br>- No other profiles can be connected or modified |
|
||||
| ByPassForLocal | When set to **True**, requests to local resources on the same Wi-Fi neetwork as the VPN client can bypass VPN |
|
||||
| DnsSuffix | Enter one or more comma-separated DNS suffixes. The first suffix listed is usedas the primary connection-specific DNS suffix for the VPN interface. The list is added to the SuffixSearchList. |
|
||||
| TrustedNetworkDetection | Enter a comma-separated string to identify the trusted network. VPN will not connect automatically when the user is on their corporate wireless network where protected resources are directly accessible to the device. |
|
||||
| LockDown | When set to **True**:</br>- Profile automatically becomes an "always on" profile</br>- VPN cannot be disconnected</br>-If the profile is not connected, the user has no network connectivity</br>- No other profiles can be connected or modified |
|
||||
| Proxy | Configure to **Automatic** or **Manual** |
|
||||
| ProxyAutoConfigUrl | When **Proxy** is set to **Automatic**, enter the URL to automatically retrieve the proxy settings |
|
||||
| ProxyServer | When **Proxy** is set to **Manual**, enter the proxy server address as a fully qualified hostname or enter `IP address:Port` |
|
||||
| RememberCredentials | Select whether credentials should be cached |
|
||||
| TrustedNetworkDetection | Enter a comma-separated string to identify the trusted network. VPN will not connect automatically when the user is on their corporate wireless network where protected resources are directly accessible to the device. |
|
||||
|
||||
When **ProfileType** is set to **Native**, the following additional settings are available.
|
||||
|
||||
Setting | Description
|
||||
--- | ---
|
||||
AuthenticationUserMethod | When you set **NativeProtocolType** to **IKEv2**, choose between **EAP** and **MSChapv2**.
|
||||
EAPConfiguration | When you set **AuthenticationUserMethod** to **EAP**, enter the HTML-encoded XML to configure EAP. For more information, see [EAP configuration](https://docs.microsoft.com/windows/client-management/mdm/eap-configuration).
|
||||
NativeProtocolType | Choose between **PPTP**, **L2TP**, **IKEv2**, and **Automatic**.
|
||||
RoutingPolicyType | Choose between **SplitTunnel**, in which traffic can go over any interface as determined by the networking stack, and **ForceTunnel**, in which all IP traffic must go over the VPN interface.
|
||||
Server | Enter the public or routable IP address or DNS name for the VPN gateway. It can point to the exteranl IP of a gateway or a virtual IP for a server farm.
|
||||
|
||||
When **ProfileType** is set to **Third Party**, the following additional settings are available.
|
||||
|
||||
Setting | Description
|
||||
--- |---
|
||||
PluginProfileCustomConfiguration | Enter HTML-encoded XML for SSL-VPN plug-in specific configuration, including authentication information that is deployed to the device to make it available for SSL-VPN plug-ins. Contact the plug-in provider for format and other details. Most plug-ins can also configure values based on the server negotiations as well as defaults.
|
||||
PluginProfilePackageFamilyName | Choose between **Pulse Secure VPN**, **F5 VPN Client**, and **SonicWALL Mobile Connect**.
|
||||
PluginProfileServerUrlList | Enter a comma-separated list of servers in URL, hostname, or IP format.
|
||||
|
||||
## WiFiSense
|
||||
|
||||
|
||||
@ -16,62 +16,54 @@ author: greg-lindsay
|
||||
**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 key capabilities and limitations of each, is a key task.
|
||||
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 tables summarize different Windows 10 deployment options and requirements.
|
||||
The following table summarizes 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.
|
||||
- Dynamic deployment methods enable you to configure applications and settings for specific use cases.
|
||||
- Traditional deployment methods use tools such as Microsoft Deployment Toolkit (MDT) and System Center Configuration Manager.<br>
|
||||
|
||||
| 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](https://docs.microsoft.com/en-us/windows/deployment/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](https://docs.microsoft.com/windows/deployment/upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit)<br>[Perform an in-place upgrade to Windows 10 using Configuration Manager](https://docs.microsoft.com/windows/deployment/upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager) |
|
||||
| [Subscription Activation](#windows-10-subscription-activation) | Switch from Windows 10 Pro to Enterprise when a subscribed user signs in. |[Windows 10 Subscription Activation](https://docs.microsoft.com/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](https://docs.microsoft.com/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](https://docs.microsoft.com/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](https://docs.microsoft.com/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt)<br>[Install a new version of Windows on a new computer with System Center Configuration Manager](https://docs.microsoft.com/sccm/osd/deploy-use/install-new-windows-version-new-computer-bare-metal) |
|
||||
| [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](https://docs.microsoft.com/windows/deployment/deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10)<br>[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](https://docs.microsoft.com/windows/deployment/deploy-windows-sccm/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](https://docs.microsoft.com/windows/deployment/deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer)<br>[Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](https://docs.microsoft.com/windows/deployment/deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager) |
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tr><td style='padding:0in 4pt 0in 4pt;border:dotted #FFFFFF 0.0pt;'><b>Mitigation</b>
|
||||
<tr><td style='padding:0in 4pt 0in 4pt;border:dotted #FFFFFF 0.0pt;'>
|
||||
|
||||
OS requirements:
|
||||
<br>
|
||||
[Analyze log files](#analyze-log-files) in order to determine the files or registry entires that are blocking data migration.
|
||||
|
||||
<table border="1" align='left'>
|
||||
<tr style="text-align:center;">
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'>
|
||||
<b>Category</b>
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'>
|
||||
<b>Scenario</b>
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'>
|
||||
<b>Windows 10 1703 or later</b>
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'>
|
||||
<b>Windows 7 up to Windows 10 1607</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" valign="middle" style="width:16%; border:1;" rowspan="2">
|
||||
Modern
|
||||
This error can be due to a problem with user profiles. It can occur due to corrupt registry entries under **HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList** or invalid files in the **\\Users** directory.
|
||||
|
||||
Note: If a previous upgrade did not complete, invalid profiles might exist in the **Windows.old\\Users** directory.
|
||||
|
||||
To repair this error, ensure that deleted accounts are not still present in the Windows registry and that files under the \\Users directory are valid. Delete the invalid files or user profiles that are causing this error. The specific files and profiles that are causing the error will be recorded in the Windows setup log files.
|
||||
|
||||
</table>
|
||||
|
||||
<table border="1">
|
||||
<tr><td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'><b>Category</b></td>
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'><b>Scenario</b></td>
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'><b>Description</b></td>
|
||||
<td align="center" style="width:16%; border:1;" bgcolor='#a0e4fa'><b>More information</b></td></tr>
|
||||
<tr><td align='center' valign='middle' style='width:16%; border:1;' rowspan="2">Modern</td>
|
||||
<td align="center">
|
||||
|
||||
[Windows AutoPilot](#windows-autopilot)</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Customize the out-of-box-experience (OOBE) for your organization, and deploy a new system with apps and settings already configured.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Windows AutoPilot
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
X
|
||||
<a href="https://docs.microsoft.com/en-us/windows/deployment/windows-10-autopilot">Overview of Windows AutoPilot</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
In-place upgrade
|
||||
|
||||
[In-place upgrade](#in-place-upgrade)
|
||||
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Use Windows Setup to update your OS and migrate apps and settings. Rollback data is saved in Windows.old.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
<a href="https://docs.microsoft.com/windows/deployment/upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit">Perform an in-place upgrade to Windows 10 with MDT</a><br><a href="https://docs.microsoft.com/windows/deployment/upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager">Perform an in-place upgrade to Windows 10 using Configuration Manager</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -79,91 +71,99 @@ OS requirements:
|
||||
Dynamic
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Subscription Activation
|
||||
|
||||
[Subscription Activation](#windows-10-subscription-activation)
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
Switch from Windows 10 Pro to Enterprise when a subscribed user signs in.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
X
|
||||
<a href="https://docs.microsoft.com/windows/deployment/windows-10-enterprise-subscription-activation">Windows 10 Subscription Activation</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
AAD / MDM
|
||||
|
||||
[AAD / MDM](#dynamic-provisioning)
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
The device is automatically joined to AAD and configured by MDM.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
<a href="https://docs.microsoft.com/windows/client-management/mdm/azure-active-directory-integration-with-mdm">Azure Active Directory integration with MDM</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Provisioning packages
|
||||
|
||||
[Provisioning packages](#dynamic-provisioning)
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
Using the Windows Imaging and Configuration Designer tool, create provisioning packages that can be applied to devices.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
<a href="https://docs.microsoft.com/windows/configuration/configure-devices-without-mdm">Configure devices without MDM</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="width:16%; border:1;" rowspan="3">
|
||||
Traditional
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Bare metal
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
|
||||
[Bare metal](#new-computer)
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
Deploy a new device, or wipe an existing device and deploy with a fresh image.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
<a href="https://docs.microsoft.com/windows/deployment/deploy-windows-mdt/deploy-a-windows-10-image-using-mdt">Deploy a Windows 10 image using MDT</a><br><a href="https://docs.microsoft.com/sccm/osd/deploy-use/install-new-windows-version-new-computer-bare-metal">Install a new version of Windows on a new computer with System Center Configuration Manager</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Refresh
|
||||
|
||||
[Refresh](#computer-refresh)
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
Also called wipe and load. Redeploy a device by saving the user state, wiping the disk, then restoring the user state.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
<a href="https://docs.microsoft.com/windows/deployment/deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10">Refresh a Windows 7 computer with Windows 10</a><br><a href="https://docs.microsoft.com/windows/deployment/deploy-windows-sccm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager">Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
Replace
|
||||
|
||||
[Replace](#computer-replace)
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
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.
|
||||
</td>
|
||||
<td align="center" style="width:16%; border:1;">
|
||||
<b>✓</b>
|
||||
<a href="https://docs.microsoft.com/windows/deployment/deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer">Replace a Windows 7 computer with a Windows 10 computer</a><br><a href="https://docs.microsoft.com/windows/deployment/deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager">Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<br>
|
||||
|
||||
>[!NOTE]
|
||||
>There is no pre-existing OS in the Windows AutoPilot or bare metal scenarios, so apps and settings are not migrated. In all other scenarios the existing apps and user settings are typically migrated to the new operating system.
|
||||
|
||||
## Windows AutoPilot
|
||||
>[!IMPORTANT]
|
||||
>The Windows AutoPilot and Subscription Activation scenarios require that the beginning OS be Windows 10 version 1703, or later.<br>
|
||||
>Except for clean install scenarios such as traditional bare metal and Windows AutoPilot, all the methods described can optionally migrate apps and settings to the new OS.
|
||||
|
||||
## Modern deployment methods
|
||||
|
||||
Modern deployment methods embrace both traditional on-prem and cloud services to deliver a simple, streamlined, cost effective deployment experience.
|
||||
|
||||
### Windows AutoPilot
|
||||
|
||||
Windows AutoPilot is a new suite of capabilities designed to simplify and modernize the deployment and management of new Windows 10 PCs. Windows AutoPilot enables IT professionals to customize the Out of Box Experience (OOBE) for Windows 10 PCs and provide end users with a fully configured new Windows 10 device after just a few clicks. There are no images to deploy, no drivers to inject, and no infrastructure to manage. Users can go through the deployment process independently, without the need consult their IT administrator.
|
||||
|
||||
For more information about Windows AutoPilot, see [Overview of Windows AutoPilot](https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot) and [Modernizing Windows deployment with Windows AutoPilot](https://blogs.technet.microsoft.com/windowsitpro/2017/06/29/modernizing-windows-deployment-with-windows-autopilot/).
|
||||
|
||||
## Windows 10 Subscription Activation
|
||||
|
||||
Windows 10 Subscription Activation is a modern deployment method that enables you to change the SKU from Pro to Enterprise with no keys and no reboots. For more information about Subscription Activation, see [Windows 10 Subscription Activation](https://docs.microsoft.com/en-us/windows/deployment/windows-10-enterprise-subscription-activation).
|
||||
|
||||
## In-place upgrade
|
||||
### In-place upgrade
|
||||
|
||||
For existing computers running Windows 7, Windows 8, or Windows 8.1, the recommended path for organizations deploying Windows 10 leverages the Windows installation program (Setup.exe) to perform an in-place upgrade, which automatically preserves all data, settings, applications, and drivers from the existing operating system version. This requires the least IT effort, because there is no need for any complex deployment infrastructure.
|
||||
|
||||
@ -188,26 +188,27 @@ There are some situations where you cannot use in-place upgrade; in these situat
|
||||
- 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.
|
||||
|
||||
|
||||
## Dynamic provisioning
|
||||
|
||||
For new PCs, organizations have historically replaced the version of Windows included on the device with their own custom Windows image, because this was often faster and easier than leveraging the preinstalled version. But this is an added expense due to the time and effort required. With the new dynamic provisioning capabilities and tools provided with Windows 10, it is now possible to avoid this.
|
||||
|
||||
The goal of dynamic provisioning is to take a new PC out of the box, turn it on, and transform it into a productive organization device, with minimal time and effort. The types of transformations that are available include:
|
||||
|
||||
- Changing the Windows edition with a single reboot. For organizations that have Software Assurance for Windows, it is easy to change a device from Windows 10 Pro to Windows 10 Enterprise, just by specifying an appropriate product or setup key. When the device restarts, all of the Windows 10 Enterprise features will be enabled.
|
||||
### Windows 10 Subscription Activation<A ID="windows-10-subscription-activation"></A>
|
||||
|
||||
- Configuring the device with VPN and Wi-Fi connections that may be needed to gain access to organization resources.
|
||||
- Installation of additional apps needed for organization functions.
|
||||
- Configuration of common Windows settings to ensure compliance with organization policies.
|
||||
- Enrollment of the device in a mobile device management (MDM) solution, such as Microsoft Intune.
|
||||
Windows 10 Subscription Activation is a modern deployment method that enables you to change the SKU from Pro to Enterprise with no keys and no reboots. For more information about Subscription Activation, see [Windows 10 Subscription Activation](https://docs.microsoft.com/en-us/windows/deployment/windows-10-enterprise-subscription-activation).
|
||||
|
||||
There are two primary dynamic provisioning scenarios:
|
||||
|
||||
- **Azure Active Directory (Azure AD) Join with automatic mobile device management (MDM) enrollment.** In this scenario, the organization member just needs to provide their work or school user ID and password; the device can then be automatically joined to Azure Active Directory and enrolled in a mobile device management (MDM) solution with no additional user interaction. Once done, the MDM solution can finish configuring the device as needed.
|
||||
### Azure Active Directory (AAD) join with automatic mobile device management (MDM) enrollment
|
||||
|
||||
- **Provisioning package configuration.** Using the [Windows Imaging and Configuration Designer (ICD)](https://go.microsoft.com/fwlink/p/?LinkId=619358), IT administrators can create a self-contained package that contains all of the configuration, settings, and apps that need to be applied to a machine. These packages can then be deployed to new PCs through a variety of means, typically by IT professionals. For more information, see [Configure devices without MDM](/windows/configuration/configure-devices-without-mdm).
|
||||
In this scenario, the organization member just needs to provide their work or school user ID and password; the device can then be automatically joined to Azure Active Directory and enrolled in a mobile device management (MDM) solution with no additional user interaction. Once done, the MDM solution can finish configuring the device as needed. For more information, see [Azure Active Directory integration with MDM](https://docs.microsoft.com/en-us/windows/client-management/mdm/azure-active-directory-integration-with-mdm).
|
||||
|
||||
Either way, these scenarios can be used to enable “choose your own device” (CYOD) programs where the organization’s users can pick their own PC and not be restricted to a small list of approved or certified models (programs that are difficult to implement using traditional deployment scenarios).
|
||||
### Provisioning package configuration
|
||||
|
||||
Using the [Windows Imaging and Configuration Designer (ICD)](https://go.microsoft.com/fwlink/p/?LinkId=619358), IT administrators can create a self-contained package that contains all of the configuration, settings, and apps that need to be applied to a machine. These packages can then be deployed to new PCs through a variety of means, typically by IT professionals. For more information, see [Configure devices without MDM](/windows/configuration/configure-devices-without-mdm).
|
||||
|
||||
These scenarios can be used to enable “choose your own device” (CYOD) programs where the organization’s users can pick their own PC and not be restricted to a small list of approved or certified models (programs that are difficult to implement using traditional deployment scenarios).
|
||||
|
||||
While the initial Windows 10 release includes a variety of provisioning settings and deployment mechanisms, these will continue to be enhanced and extended based on feedback from organizations. As with all Windows features, organizations can submit suggestions for additional features through the Windows Feedback app or through their Microsoft Support contacts.
|
||||
|
||||
@ -226,6 +227,7 @@ The traditional deployment scenario can be divided into different sub-scenarios.
|
||||
- **Computer replace.** A replacement of the old machine with a new machine (with user-state migration and an optional full WIM image backup).
|
||||
|
||||
### New computer
|
||||
|
||||
This scenario occurs when you have a blank machine you need to deploy, or an existing machine you want to wipe and redeploy without needing to preserve any existing data. The setup starts from a boot media, using CD, USB, ISO, or Pre-Boot Execution Environment (PXE). You can also generate a full offline media that includes all the files needed for a client deployment, allowing you to deploy without having to connect to a central deployment share. The target can be a physical computer, a virtual machine, or a Virtual Hard Disk (VHD) running on a physical computer (boot from VHD).
|
||||
|
||||
The deployment process for the new machine scenario is as follows:
|
||||
@ -241,6 +243,7 @@ The deployment process for the new machine scenario is as follows:
|
||||
After taking these steps, the computer is ready for use.
|
||||
|
||||
### Computer refresh
|
||||
|
||||
A refresh is sometimes called wipe-and-load. The process is normally initiated in the running operating system. User data and settings are backed up and restored later as part of the deployment process. The target can be the same as for the new computer scenario.
|
||||
|
||||
The deployment process for the wipe-and-load scenario is as follows:
|
||||
@ -260,6 +263,7 @@ The deployment process for the wipe-and-load scenario is as follows:
|
||||
After taking these steps, the machine is ready for use.
|
||||
|
||||
### Computer replace
|
||||
|
||||
A computer replace is similar to the refresh scenario. However, since we are replacing the machine, we divide this scenario into two main tasks: backup of the old client and bare-metal deployment of the new client. As with the refresh scenario, user data and settings are backed up and restored.
|
||||
|
||||
The deployment process for the replace scenario is as follows:
|
||||
@ -271,6 +275,7 @@ The deployment process for the replace scenario is as follows:
|
||||
**Note**<br>In some situations, you can use the replace scenario even if the target is the same machine. For example, you can use replace if you want to modify the disk layout from the master boot record (MBR) to the GUID partition table (GPT), which will allow you to take advantage of the Unified Extensible Firmware Interface (UEFI) functionality. You can also use replace if the disk needs to be repartitioned since user data needs to be transferred off the disk.
|
||||
|
||||
## Related topics
|
||||
|
||||
- [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](upgrade/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md)
|
||||
- [Upgrade to Windows 10 with System Center Configuration Manager](upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md)
|
||||
- [Deploy Windows 10 with System Center 2012 R2 Configuration Manager](https://go.microsoft.com/fwlink/p/?LinkId=620230)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user