From 7b6fbc31cbfa175f0f3fc3311647695fa3ab63b1 Mon Sep 17 00:00:00 2001 From: jaimeo Date: Wed, 11 Jul 2018 10:19:41 -0700 Subject: [PATCH 1/4] removed out of date note about Insider; added link to Intune topic on managing Insider rings --- .../waas-deployment-rings-windows-10-updates.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/windows/deployment/update/waas-deployment-rings-windows-10-updates.md b/windows/deployment/update/waas-deployment-rings-windows-10-updates.md index bca4cfe0a9..10b578947d 100644 --- a/windows/deployment/update/waas-deployment-rings-windows-10-updates.md +++ b/windows/deployment/update/waas-deployment-rings-windows-10-updates.md @@ -4,10 +4,10 @@ description: Deployment rings in Windows 10 are similar to the deployment groups ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library -author: DaniHalfin +author: jaimeo ms.localizationpriority: medium -ms.author: daniha -ms.date: 07/27/2017 +ms.author: jaimeo +ms.date: 07/11/2018 --- # Build deployment rings for Windows 10 updates @@ -38,9 +38,7 @@ Table 1 provides an example of the deployment rings you might use. | Critical | Semi-annual channel | 180 days | 30 days | Devices that are critical and will only receive updates once they've been vetted for a period of time by the majority of the organization | >[!NOTE] ->In this example, there are no rings made up of the long-term servicing channel (LTSC). The LTSC servicing channel does not receive feature updates. -> ->Windows Insider PCs must be enrolled manually on each device and serviced based on the Windows Insider level chosen in the **Settings** app on that particular PC. Feature update servicing for Windows Insider devices is done completely through Windows Update; no servicing tools can manage Windows Insider feature updates. +>In this example, there are no rings made up of the long-term servicing channel (LTSC). The LTSC does not receive feature updates. As Table 1 shows, each combination of servicing channel and deployment group is tied to a specific deployment ring. As you can see, the associated groups of devices are combined with a servicing channel to specify which deployment ring those devices and their users fall into. The naming convention used to identify the rings is completely customizable as long as the name clearly identifies the sequence. Deployment rings represent a sequential deployment timeline, regardless of the servicing channel they contain. Deployment rings will likely rarely change for an organization, but they should be periodically assessed to ensure that the deployment cadence still makes sense. @@ -66,6 +64,7 @@ As Table 1 shows, each combination of servicing channel and deployment group is - [Configure Windows Update for Business](waas-configure-wufb.md) - [Integrate Windows Update for Business with management solutions](waas-integrate-wufb.md) - [Walkthrough: use Group Policy to configure Windows Update for Business](waas-wufb-group-policy.md) +- [Manage software updates in Intune](https://docs.microsoft.com/intune/windows-update-for-business-configure) - [Walkthrough: use Intune to configure Windows Update for Business](waas-wufb-intune.md) - [Manage device restarts after updates](waas-restart.md) From 8ec189d6a17f0ec44e04839c7341f818e4b95ab0 Mon Sep 17 00:00:00 2001 From: jaimeo Date: Wed, 11 Jul 2018 11:23:20 -0700 Subject: [PATCH 2/4] added link to blog post about UR details --- .../update/windows-analytics-FAQ-troubleshooting.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/windows/deployment/update/windows-analytics-FAQ-troubleshooting.md b/windows/deployment/update/windows-analytics-FAQ-troubleshooting.md index 37f12a310f..3bf18afce3 100644 --- a/windows/deployment/update/windows-analytics-FAQ-troubleshooting.md +++ b/windows/deployment/update/windows-analytics-FAQ-troubleshooting.md @@ -8,7 +8,7 @@ ms.sitesec: library ms.pagetype: deploy author: jaimeo ms.author: jaimeo -ms.date: 07/02/2018 +ms.date: 07/11/2018 ms.localizationpriority: high --- @@ -229,3 +229,6 @@ System Center Configuration Manager (SCCM) considers a device ready to upgrade i Currently, you can choose the criteria you wish to use: - To use the SCCM criteria, create the collection of devices ready to upgrade within the SCCM console (using the analytics connector). - To use the Upgrade Readiness criteria, export the list of ready-to-upgrade devices from the corresponding Upgrade Readiness report, and then build the SCCM collection from that spreadsheet. + +### How does Upgrade Readiness collect the inventory of devices and applications? +For details about this process and some tips, see [How does Upgrade Readiness in WA collects application inventory for your OMS workspace?](https://techcommunity.microsoft.com/t5/Windows-Analytics-Blog/How-does-Upgrade-Readiness-in-WA-collects-application-inventory/ba-p/213586) on the Windows Analytics blog. \ No newline at end of file From 37e4bf3070d34155a0a7d6fdbe7cde1c6309fc3c Mon Sep 17 00:00:00 2001 From: Maricia Alforque Date: Wed, 11 Jul 2018 18:36:09 +0000 Subject: [PATCH 3/4] Merged PR 9698: WiredNNetwork CSP - new CSP --- windows/client-management/mdm/TOC.md | 3 +- ...onfiguration-service-provider-reference.md | 31 ++++ .../images/provisioning-csp-wirednetwork.png | Bin 0 -> 5976 bytes ...ew-in-windows-mdm-enrollment-management.md | 4 + .../client-management/mdm/wirednetwork-csp.md | 34 ++++ .../mdm/wirednetwork-ddf-file.md | 167 ++++++++++++++++++ 6 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 windows/client-management/mdm/images/provisioning-csp-wirednetwork.png create mode 100644 windows/client-management/mdm/wirednetwork-csp.md create mode 100644 windows/client-management/mdm/wirednetwork-ddf-file.md diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md index 9efa92de94..fc15a38c27 100644 --- a/windows/client-management/mdm/TOC.md +++ b/windows/client-management/mdm/TOC.md @@ -320,4 +320,5 @@ #### [WindowsLicensing DDF file](windowslicensing-ddf-file.md) ### [WindowsSecurityAuditing CSP](windowssecurityauditing-csp.md) #### [WindowsSecurityAuditing DDF file](windowssecurityauditing-ddf-file.md) - +### [WiredNetwork CSP](wirednetwork-csp.md) +#### [WiredNetwork DDF file](wirednetwork-ddf-file.md) diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md index 5c5d9301ff..5cbbae1bca 100644 --- a/windows/client-management/mdm/configuration-service-provider-reference.md +++ b/windows/client-management/mdm/configuration-service-provider-reference.md @@ -30,6 +30,7 @@ Footnotes: - 2 - Added in Windows 10, version 1703 - 3 - Added in Windows 10, version 1709 - 4 - Added in Windows 10, version 1803 +- 5 - Added in Windows 10, next major version
@@ -2531,6 +2532,34 @@ Footnotes: + +[WiredNetwork CSP](wirednetwork-csp.md) + + + + + + + + + + + + + + + + + + + + + +
HomeProBusinessEnterpriseEducationMobileMobile Enterprise
cross markcheck mark5check mark5check mark5check mark5check mark5check mark5
+ + + + [w7 APPLICATION CSP](w7-application-csp.md) @@ -2568,6 +2597,7 @@ Footnotes: - 2 - Added in Windows 10, version 1703 - 3 - Added in Windows 10, version 1709 - 4 - Added in Windows 10, version 1803 +- 5 - Added in Windows 10, next major version ## CSP DDF files download @@ -2614,6 +2644,7 @@ The following list shows the configuration service providers supported in Window - 2 - Added in Windows 10, version 1703 - 3 - Added in Windows 10, version 1709 - 4 - Added in Windows 10, version 1803 +- 5 - Added in Windows 10, next major version ## CSPs supported in Microsoft Surface Hub diff --git a/windows/client-management/mdm/images/provisioning-csp-wirednetwork.png b/windows/client-management/mdm/images/provisioning-csp-wirednetwork.png new file mode 100644 index 0000000000000000000000000000000000000000..2fd93631ff9f4e2faa8b9a1e7681560033fa1a53 GIT binary patch literal 5976 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 literal 0 HcmV?d00001 diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 83d93b958d..e0c740845e 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -1659,6 +1659,10 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
  • Start/ImportEdgeAssets - added a table of SKU support information.
  • + +[WiredNetwork CSP](wirednetwork-csp.md) +New CSP added in Windows 10, next major version. + diff --git a/windows/client-management/mdm/wirednetwork-csp.md b/windows/client-management/mdm/wirednetwork-csp.md new file mode 100644 index 0000000000..6a06c59879 --- /dev/null +++ b/windows/client-management/mdm/wirednetwork-csp.md @@ -0,0 +1,34 @@ +--- +title: WiredNetwork CSP +description: The WiredNetwork configuration service provider (CSP) is used by the enterprise to configure wired Internet on devices that do not have GP to enable them to access corporate Internet over ethernet. +ms.author: maricia +ms.topic: article +ms.prod: w10 +ms.technology: windows +author: MariciaAlforque +ms.date: 06/27/2018 +--- + +# WiredNetwork CSP + +> [!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. + +The WiredNetwork configuration service provider (CSP) is used by the enterprise to configure wired Internet on devices that do not have GP to enable them to access corporate Internet over ethernet. This CSP was added in Windows 10, next major version. + +The following diagram shows the WiredNetwork configuration service provider in tree format. + +![WiredNetwork CSP diagram](images/provisioning-csp-wirednetwork.png) + +**./Device/Vendor/MSFT/WiredNetwork** +Root node. + +**LanXML** +Optional. XML describing the wired network configuration and follows the LAN_profile schemas https://msdn.microsoft.com/en-us/library/windows/desktop/aa816366(v=vs.85).aspx. + +Supported operations are Add, Get, Replace, and Delete. Value type is string. + +**EnableBlockPeriod** + Optional. Enable block period (minutes), used to specify the duration for which automatic authentication attempts will be blocked from occurring after a failed authentication attempt. + +Supported operations are Add, Get, Replace, and Delete. Value type is integer. \ No newline at end of file diff --git a/windows/client-management/mdm/wirednetwork-ddf-file.md b/windows/client-management/mdm/wirednetwork-ddf-file.md new file mode 100644 index 0000000000..0a156256a0 --- /dev/null +++ b/windows/client-management/mdm/wirednetwork-ddf-file.md @@ -0,0 +1,167 @@ +--- +title: WiredNetwork DDF file +description: This topic shows the OMA DM device description framework (DDF) for the WiredNetwork configuration service provider. +ms.author: maricia +ms.topic: article +ms.prod: w10 +ms.technology: windows +author: MariciaAlforque +ms.date: 06/28/2018 +--- + +# WiredNetwork DDF file + + +This topic shows the OMA DM device description framework (DDF) for the WiredNetwork configuration service provider. This CSP was added in Windows 10, version 1511. + +Looking for the DDF XML files? See [CSP DDF files download](configuration-service-provider-reference.md#csp-ddf-files-download). + +The XML below is the current version for this CSP. + +``` syntax + +]> + + 1.2 + + WiredNetwork + ./User/Vendor/MSFT + + + + + + + + + + + + + + + + + + + LanXML + + + + + + + + XML describing the wired network configuration and follows the LAN_profile schemas https://msdn.microsoft.com/en-us/library/windows/desktop/aa816366(v=vs.85).aspx + + + + + + + + + + + text/plain + + + + + EnableBlockPeriod + + + + + + + + Enable block period (minutes), used to specify the duration for which automatic authentication attempts will be blocked from occurring after a failed authentication attempt. + + + + + + + + + + + text/plain + + + + + + WiredNetwork + ./Device/Vendor/MSFT + + + + + + + + + + + + + + + + + + + LanXML + + + + + + + + XML describing the wired network configuration and follows the LAN_profile schemas https://msdn.microsoft.com/en-us/library/windows/desktop/aa816366(v=vs.85).aspx + + + + + + + + + + + text/plain + + + + + EnableBlockPeriod + + + + + + + + Enable block period (minutes), used to specify the duration for which automatic authentication attempts will be blocked from occurring after a failed authentication attempt. + + + + + + + + + + + text/plain + + + + + +``` \ No newline at end of file From 4092a982191e185b9094fd0991fdc24dbd55b000 Mon Sep 17 00:00:00 2001 From: Maricia Alforque Date: Wed, 11 Jul 2018 18:39:43 +0000 Subject: [PATCH 4/4] Merged PR 9699: WiFi CSP - added one new node --- .../mdm/images/provisioning-csp-wifi.png | Bin 10985 -> 12742 bytes ...ew-in-windows-mdm-enrollment-management.md | 4 + windows/client-management/mdm/wifi-csp.md | 15 +- .../client-management/mdm/wifi-ddf-file.md | 187 +++++++++++++++++- 4 files changed, 201 insertions(+), 5 deletions(-) diff --git a/windows/client-management/mdm/images/provisioning-csp-wifi.png b/windows/client-management/mdm/images/provisioning-csp-wifi.png index 463a784f956245bd7dc623803d28528317424efc..f5891084eab0ccbd2ed71110c3d9956b2cbaf846 100644 GIT binary patch literal 12742 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℞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 diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index e0c740845e..5e145ab167 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -1638,6 +1638,10 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware +[Wifi CSP](wifi-csp.md) +

    Added a new node WifiCost.

    + + [Diagnose MDM failures in Windows 10](diagnose-mdm-failures-in-windows-10.md)

    Recent changes:

      diff --git a/windows/client-management/mdm/wifi-csp.md b/windows/client-management/mdm/wifi-csp.md index 6e43514e39..f1d6952717 100644 --- a/windows/client-management/mdm/wifi-csp.md +++ b/windows/client-management/mdm/wifi-csp.md @@ -7,7 +7,7 @@ ms.topic: article ms.prod: w10 ms.technology: windows author: MariciaAlforque -ms.date: 04/16/2018 +ms.date: 06/28/2018 --- # WiFi CSP @@ -59,8 +59,6 @@ If it exists in the blob, the **keyType** and **protected** elements must come b > **Note**  If you need to specify other advanced conditions, such as specifying criteria for certificates that can be used by the Wi-Fi profile, you can do so by specifying this through the EapHostConfig portion of the WlanXML. For more information, see [EAP configuration](http://go.microsoft.com/fwlink/p/?LinkId=618963). -  - The supported operations are Add, Get, Delete, and Replace. **Proxy** @@ -96,6 +94,17 @@ Added in Windows 10, version 1607. Optional. When set to true it enables Web Pr Value type is bool. +**WiFiCost** +Added in Windows 10, next major version. Optional. This policy sets the cost of WLAN connection for the Wi-Fi profile. Default behaviour: Unrestricted. + +Supported values: + +- 1 - Unrestricted - unlimited connection +- 2 - Fixed - capacity constraints up to a certain data limit +- 3 - Variable - paid on per byte basic + +Supported operations are Add, Get, Replace and Delete. Value type is integer. + ## Examples diff --git a/windows/client-management/mdm/wifi-ddf-file.md b/windows/client-management/mdm/wifi-ddf-file.md index b5bcd3d75e..e8bbb6795d 100644 --- a/windows/client-management/mdm/wifi-ddf-file.md +++ b/windows/client-management/mdm/wifi-ddf-file.md @@ -7,7 +7,7 @@ ms.topic: article ms.prod: w10 ms.technology: windows author: MariciaAlforque -ms.date: 06/26/2017 +ms.date: 06/28/2018 --- # WiFi DDF file @@ -15,7 +15,190 @@ ms.date: 06/26/2017 This topic shows the OMA DM device description framework (DDF) for the **WiFi** configuration service provider. DDF files are used only with OMA DM provisioning XML. -Content under development and will be published soon. +The XML below is for Windows 10, next major version. + +``` syntax + + +]> + + 1.2 + + WiFi + ./Vendor/MSFT + + + + + + + + + + + + + + + com.microsoft/1.1/MDM/WiFi + + + + Profile + + + + + + + + + + + + + + + + + + + + + + + + + + + The Profile name of the Wi-Fi network. This is added when WlanXML node is added and deleted when Wlanxml is deleted. + + + + + + + + + + SSID + + + + + + WlanXml + + + + + + + + + XML describing the network configuration and follows Windows WLAN_profile schema. + Link to schema: http://msdn.microsoft.com/en-us/library/windows/desktop/ms707341(v=vs.85).aspx + + + + + + + + + + + + text/plain + + + + + Proxy + + + + + + + + Optional node. The format is url:port. Configuration of the network proxy (if any). + + + + + + + + + + + + + + text/plain + + + + + ProxyPacUrl + + + + + + + + Optional node. URL to the PAC file location. + + + + + + + + + + + + + + text/plain + + + + + ProxyWPAD + + + + + + + + Optional node: The presence of the field enables WPAD for proxy lookup. + + + + + + + + + + + text/plain + + + + + + + +``` ## Related topics