From ea74596c3b3bca206a65ac0875c71c13780a4129 Mon Sep 17 00:00:00 2001 From: jaimeo Date: Tue, 22 May 2018 13:46:02 -0700 Subject: [PATCH 01/11] import of requested new topic material --- windows/deployment/TOC.md | 1 + .../upgrade-readiness-target-new-OS.md | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 windows/deployment/upgrade/upgrade-readiness-target-new-OS.md diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md index 322fa570ca..e194452c11 100644 --- a/windows/deployment/TOC.md +++ b/windows/deployment/TOC.md @@ -250,6 +250,7 @@ ##### [Step 2: Resolve issues](upgrade/upgrade-readiness-resolve-issues.md) ##### [Step 3: Deploy Windows](upgrade/upgrade-readiness-deploy-windows.md) ##### [Additional insights](upgrade/upgrade-readiness-additional-insights.md) +##### [Targeting a new operating system version](upgrade/upgrade-readiness-target-new-OS.md) ### [Monitor Windows Updates with Update Compliance](update/update-compliance-monitor.md) #### [Get started with Update Compliance](update/update-compliance-get-started.md) #### [Use Update Compliance](update/update-compliance-using.md) diff --git a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md new file mode 100644 index 0000000000..e7556bced3 --- /dev/null +++ b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md @@ -0,0 +1,49 @@ +--- +title: Upgrade Readiness - Targeting a new operating system version +description: Explains how to run Upgrade Readiness again to target a different operating system version or bulk-approve all apps from a given vendor +ms.prod: w10 +author: jaimeo +ms.date: 05/22/2018 +--- + +# Targeting a new operating system version + +After you've used Upgrade Readiness to help deploy a given version of Windows 10, you might want to use it again to help deploy a newer version of Windows 10. When you change the target operating system version (as described in [Use Upgrade Readiness to manage Windows upgrades](use-upgrade-readiness-to-manage-windows-upgrades#target-version.md), the app states (Importance, AppOwner, UpgradeDecision, TestPlan and TestResult) are not reset. Follow this guidance to preserve or reset these states as needed: + +## TestResults + +If you want to preserve the TestResults from the previous operating system version testing, there is nothing you need to do. + +If you want to reset them, click any of the rows in the **Prioritize Application** blade (described in [Upgrade Readiness - Step 1: Identify important apps](upgrade-readiness-identify-apps.md)). This will take you to the **Log Search** user experience. Replace the query in that window with the following query: + +`search in (UAApp) IsRollup == true and RollupLevel == "Granular" and TestResult <> "Not started"` + +After a short period of time, you will see the "user input" perspective render, which will let you bulk-edit the results. Select the check box in the table header, click the **bulk edit** button, and then set the **TestResult** to *Not started*. Leave all other fields as they are. + +## UpgradeDecision + +If you want to preserve the UpgradeDecision from the previous operating system version testing, there is nothing you need to do. + +If you want to reset them, keep these important points in mind: + +- Make sure to *not* reset the **Ready to upgrade** decision for the "long tail" of apps that have importance of **Ignore** or **Low install count**. Doing this will make it extremely difficult to complete the Upgrade Readiness workflow. +- Decide which decisions to reset. For example, one option is just to reset the decisions marked **Ready to upgrade** (in order to retest those), while preserving states of apps marked **Won't upgrade**. Doing this means you won't lose track of this previous marking. Or you can reset everything. + +To do this, type the following query in **Log Search**: + +`search in (UAApp) IsRollup == true and RollupLevel == "Granular" and Importance <> "Ignore" and Importance <> "Low install count"` + +>[!NOTE] +>You can also append `'and UpgradeDecision="Ready to upgrade"'`, for example, if you just want to reset apps that were previously marked **Ready**. + +After a short period of time, you will see the "user input" perspective render, which will let you bulk-edit the results. Select the check box in the table header, click the **bulk edit** button, and then set the **UpgradeDecision** to *Not reviewed*. Leave all other fields as they are. + + +## Bulk-approving apps from a given vendor + +You can bulk-approve all apps from a given vendor (for example, Microsoft) if there are no known compatibility issues. To do this, type the following query in **Log Search**: + +`search in (UAApp) IsRollup == true and RollupLevel == "Granular" and AppVendor has "Microsoft" and UpgradeAssessment=="No known issues" and UpgradeDecision<>"Ready to upgrade"` + +After a short period of time, you will see the "user input" perspective render, which will let you bulk-edit the results. Select the check box in the table header, click the **bulk edit" button**, and then set the **UpgradeDecision** to *Ready to upgrade*. Leave all other fields as they are. + From c94a5915a96994e8ac0dfb52e5342eeb5d95a805 Mon Sep 17 00:00:00 2001 From: jaimeo Date: Tue, 22 May 2018 14:37:17 -0700 Subject: [PATCH 02/11] fixing links and typos --- .../upgrade/upgrade-readiness-target-new-OS.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md index e7556bced3..85c0583285 100644 --- a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md +++ b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md @@ -8,13 +8,13 @@ ms.date: 05/22/2018 # Targeting a new operating system version -After you've used Upgrade Readiness to help deploy a given version of Windows 10, you might want to use it again to help deploy a newer version of Windows 10. When you change the target operating system version (as described in [Use Upgrade Readiness to manage Windows upgrades](use-upgrade-readiness-to-manage-windows-upgrades#target-version.md), the app states (Importance, AppOwner, UpgradeDecision, TestPlan and TestResult) are not reset. Follow this guidance to preserve or reset these states as needed: +After you've used Upgrade Readiness to help deploy a given version of Windows 10, you might want to use it again to help deploy a newer version of Windows 10. When you change the target operating system version (as described in [Use Upgrade Readiness to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades#target-version.md)), the app states (Importance, AppOwner, UpgradeDecision, TestPlan, and TestResult) are not reset. Follow this guidance to preserve or reset these states as needed: ## TestResults If you want to preserve the TestResults from the previous operating system version testing, there is nothing you need to do. -If you want to reset them, click any of the rows in the **Prioritize Application** blade (described in [Upgrade Readiness - Step 1: Identify important apps](upgrade-readiness-identify-apps.md)). This will take you to the **Log Search** user experience. Replace the query in that window with the following query: +If you want to reset them, click any of the rows in the **Prioritize Application** blade (described in [Upgrade Readiness - Step 1: Identify important apps](upgrade/upgrade-readiness-identify-apps.md)). This will take you to the **Log Search** user experience. Replace the query in that window with the following query: `search in (UAApp) IsRollup == true and RollupLevel == "Granular" and TestResult <> "Not started"` @@ -47,3 +47,9 @@ You can bulk-approve all apps from a given vendor (for example, Microsoft) if th After a short period of time, you will see the "user input" perspective render, which will let you bulk-edit the results. Select the check box in the table header, click the **bulk edit" button**, and then set the **UpgradeDecision** to *Ready to upgrade*. Leave all other fields as they are. +## Related topics + +[Windows Analytics overview](../update/windows-analytics-overview) +[Manage Windows upgrades with Upgrade Readiness](manage-windows-updgrades-with-upgrade-readiness) +[Get started with Upgrade Readiness](upgrade-readiness-get-started) + From 4225e5679a4e5c2617383bcfd7cd92a86d5574fe Mon Sep 17 00:00:00 2001 From: jaimeo Date: Tue, 22 May 2018 14:58:02 -0700 Subject: [PATCH 03/11] more link fu --- .../upgrade/upgrade-readiness-target-new-OS.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md index 85c0583285..c934082d93 100644 --- a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md +++ b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md @@ -8,13 +8,13 @@ ms.date: 05/22/2018 # Targeting a new operating system version -After you've used Upgrade Readiness to help deploy a given version of Windows 10, you might want to use it again to help deploy a newer version of Windows 10. When you change the target operating system version (as described in [Use Upgrade Readiness to manage Windows upgrades](upgrade/use-upgrade-readiness-to-manage-windows-upgrades#target-version.md)), the app states (Importance, AppOwner, UpgradeDecision, TestPlan, and TestResult) are not reset. Follow this guidance to preserve or reset these states as needed: +After you've used Upgrade Readiness to help deploy a given version of Windows 10, you might want to use it again to help deploy a newer version of Windows 10. When you change the target operating system version (as described in [Use Upgrade Readiness to manage Windows upgrades](use-upgrade-readiness-to-manage-windows-upgrades.md#target-version)), the app states (Importance, AppOwner, UpgradeDecision, TestPlan, and TestResult) are not reset. Follow this guidance to preserve or reset these states as needed: ## TestResults If you want to preserve the TestResults from the previous operating system version testing, there is nothing you need to do. -If you want to reset them, click any of the rows in the **Prioritize Application** blade (described in [Upgrade Readiness - Step 1: Identify important apps](upgrade/upgrade-readiness-identify-apps.md)). This will take you to the **Log Search** user experience. Replace the query in that window with the following query: +If you want to reset them, click any of the rows in the **Prioritize Application** blade (described in [Upgrade Readiness - Step 1: Identify important apps](upgrade-readiness-identify-apps.md)). This will take you to the **Log Search** user experience. Replace the query in that window with the following query: `search in (UAApp) IsRollup == true and RollupLevel == "Granular" and TestResult <> "Not started"` @@ -49,7 +49,7 @@ After a short period of time, you will see the "user input" perspective render, ## Related topics -[Windows Analytics overview](../update/windows-analytics-overview) -[Manage Windows upgrades with Upgrade Readiness](manage-windows-updgrades-with-upgrade-readiness) -[Get started with Upgrade Readiness](upgrade-readiness-get-started) +[Windows Analytics overview](../update/windows-analytics-overview.md) +[Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md) +[Get started with Upgrade Readiness](upgrade-readiness-get-started.md) From 71fbf9753ff6444234b36f1eef2a9383c8c3c8e5 Mon Sep 17 00:00:00 2001 From: jaimeo Date: Tue, 22 May 2018 15:26:21 -0700 Subject: [PATCH 04/11] fixing spacing of related topics links --- windows/deployment/upgrade/upgrade-readiness-target-new-OS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md index c934082d93..a357be01c6 100644 --- a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md +++ b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md @@ -50,6 +50,8 @@ After a short period of time, you will see the "user input" perspective render, ## Related topics [Windows Analytics overview](../update/windows-analytics-overview.md) + [Manage Windows upgrades with Upgrade Readiness](manage-windows-upgrades-with-upgrade-readiness.md) + [Get started with Upgrade Readiness](upgrade-readiness-get-started.md) From f12d3f116abfb7db7dfd0f90d1c66fa1df23081b Mon Sep 17 00:00:00 2001 From: jaimeo Date: Thu, 31 May 2018 10:26:12 -0700 Subject: [PATCH 05/11] tweaks from Marc --- .../deployment/upgrade/upgrade-readiness-target-new-OS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md index a357be01c6..a44c405280 100644 --- a/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md +++ b/windows/deployment/upgrade/upgrade-readiness-target-new-OS.md @@ -3,7 +3,7 @@ title: Upgrade Readiness - Targeting a new operating system version description: Explains how to run Upgrade Readiness again to target a different operating system version or bulk-approve all apps from a given vendor ms.prod: w10 author: jaimeo -ms.date: 05/22/2018 +ms.date: 05/31/2018 --- # Targeting a new operating system version @@ -31,10 +31,10 @@ If you want to reset them, keep these important points in mind: To do this, type the following query in **Log Search**: -`search in (UAApp) IsRollup == true and RollupLevel == "Granular" and Importance <> "Ignore" and Importance <> "Low install count"` +`search in (UAApp) IsRollup == true and RollupLevel == "Granular" and Importance <> "Ignore" and Importance <> "Low install count" and UpgradeDecision == "Ready to upgrade"` >[!NOTE] ->You can also append `'and UpgradeDecision="Ready to upgrade"'`, for example, if you just want to reset apps that were previously marked **Ready**. +>If you just want to reset all **UpgradeDecision** values, you can simply remove `'and UpgradeDecision == "Ready to upgrade"` from the query. After a short period of time, you will see the "user input" perspective render, which will let you bulk-edit the results. Select the check box in the table header, click the **bulk edit** button, and then set the **UpgradeDecision** to *Not reviewed*. Leave all other fields as they are. From 03be5c917707bed4ab5f00626aabf9c0ca42ec15 Mon Sep 17 00:00:00 2001 From: Richard Zhang Date: Thu, 31 May 2018 10:50:04 -0700 Subject: [PATCH 06/11] Update apply-hotfix-for-mbam-25-sp1.md --- mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md b/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md index ff7aab122d..fc62e10abf 100644 --- a/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md +++ b/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md @@ -24,5 +24,4 @@ This topic describes the process for applying the hotfixes for Microsoft BitLock 5. Configure MBAM features using MBAM Server Configurator. #### Steps to install the new MBAM 2.5 SP1 server hotfix -refer to the document for new server installation. -https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/deploying-the-mbam-25-server-infrastructure +[New server installation](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/deploying-the-mbam-25-server-infrastructure) From b0729914ccd9ce5a5005cbdbb957418b645787bd Mon Sep 17 00:00:00 2001 From: jaimeo Date: Thu, 31 May 2018 10:57:44 -0700 Subject: [PATCH 07/11] also fixed bad links about data sharing --- .../upgrade/upgrade-readiness-deployment-script.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/windows/deployment/upgrade/upgrade-readiness-deployment-script.md b/windows/deployment/upgrade/upgrade-readiness-deployment-script.md index 5ead8a22d0..0c431543e3 100644 --- a/windows/deployment/upgrade/upgrade-readiness-deployment-script.md +++ b/windows/deployment/upgrade/upgrade-readiness-deployment-script.md @@ -5,8 +5,8 @@ ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library ms.pagetype: deploy -author: greg-lindsay -ms.date: 10/11/2017 +author: jaimeo +ms.date: 05/31/2018 --- # Upgrade Readiness deployment script @@ -146,20 +146,19 @@ The deployment script displays the following exit codes to let you know if it wa **Http Get** on the end points did not return a success exit code.
For Windows 10, connectivity is verified by connecting to https://v10.vortex-win.data.microsoft.com/health/keepalive.
For previous operating systems, connectivity is verified by connecting to https://vortex-win.data.microsoft.com/health/keepalive. -
If there is an error verifying connectivity, this will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enable data sharing](https://technet.microsoft.com/en-us/itpro/windows/deploy/upgrade-readiness-get-started#enable-data-sharing). - +
If there is an error verifying connectivity, this will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enroll devices in Windows Analytics](../update/windows-analytics-get-started.md) 13 - Can’t connect to Microsoft - setting. - An error occurred connecting to https://settings.data.microsoft.com/qos. This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enable data sharing](https://technet.microsoft.com/en-us/itpro/windows/deploy/upgrade-readiness-get-started#enable-data-sharing). Verify that the required endpoints are whitelisted correctly. See Whitelist select endpoints for more details. + An error occurred connecting to https://settings.data.microsoft.com/qos. This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enrolling devices in Windows Analytics](https://technet.microsoft.com/en-us/itpro/windows/deploy/upgrade-readiness-get-started#enable-data-sharing). Verify that the required endpoints are whitelisted correctly. See Whitelist select endpoints for more details. 14 14 - Can’t connect to Microsoft - compatexchange. - An error occurred connecting to [CompatibilityExchangeService.svc](https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc). This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enable data sharing](https://technet.microsoft.com/en-us/itpro/windows/deploy/upgrade-readiness-get-started#enable-data-sharing). + An error occurred connecting to [CompatibilityExchangeService.svc](https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc). This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enroll devices in Windows Analytics](../update/windows-analytics-get-started.md). 15 - Function CheckVortexConnectivity failed with an unexpected exception. - This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enable data sharing](https://technet.microsoft.com/en-us/itpro/windows/deploy/upgrade-readiness-get-started#enable-data-sharing). Check the logs for the exception message and the HResult. + This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enroll devices in Windows Analytics](../update/windows-analytics-get-started.md). Check the logs for the exception message and the HResult. 16 - The computer requires a reboot before running the script. From f634aebe8eea73e4530f86b06057d7c2ec2fa5d5 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Thu, 31 May 2018 11:01:04 -0700 Subject: [PATCH 08/11] updated the ms.author and author metadata --- .../system-requirements-and-language-support-for-ie11.md | 2 +- mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md b/browsers/internet-explorer/ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md index c756e654f2..932eb43359 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md +++ b/browsers/internet-explorer/ie11-deploy-guide/system-requirements-and-language-support-for-ie11.md @@ -24,7 +24,7 @@ ms.date: 07/27/2017 Internet Explorer 11 is available for a number of systems and languages. This topic provides info about the minimum system requirements and language support. ## Minimum system requirements for IE11 -IE11 is pre-installed on Windows 8.1 and Windows Server 2012 R2 and is listed here for reference. It's also supported on Windows 10, but isn't pre-installed. For more info about IE11 on Windows 10, see [Browser: Microsoft Edge and Internet Explorer 11](https://technet.microsoft.com/library/mt156988.aspx). +IE11 is pre-installed on Windows 8.1, Windows 10, and Windows Server 2012 R2 and is listed here for reference. For more info about IE11 on Windows 10, see [Browser: Microsoft Edge and Internet Explorer 11](https://technet.microsoft.com/library/mt156988.aspx). **Important**
  IE11 isn't supported on Windows 8 or Windows Server 2012. diff --git a/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md b/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md index ff7aab122d..a4155a14ef 100644 --- a/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md +++ b/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md @@ -1,7 +1,8 @@ --- title: Applying hotfixes on MBAM 2.5 SP1 description: Applying hotfixes on MBAM 2.5 SP1 -author: ppriya-msft +ms.author: ppriya-msft +author: intothedarkness ms.assetid: ms.pagetype: mdop, security ms.mktglfcycl: manage @@ -24,5 +25,4 @@ This topic describes the process for applying the hotfixes for Microsoft BitLock 5. Configure MBAM features using MBAM Server Configurator. #### Steps to install the new MBAM 2.5 SP1 server hotfix -refer to the document for new server installation. -https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/deploying-the-mbam-25-server-infrastructure +Refer to the document for new [server installation](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/deploying-the-mbam-25-server-infrastructure). From 1e72dc85edbc4c91eb912a360ceb2961da912f73 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Thu, 31 May 2018 11:12:05 -0700 Subject: [PATCH 09/11] updated the ms.author and author metadata --- mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md b/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md index a4155a14ef..4f713f3468 100644 --- a/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md +++ b/mdop/mbam-v25/apply-hotfix-for-mbam-25-sp1.md @@ -18,11 +18,11 @@ This topic describes the process for applying the hotfixes for Microsoft BitLock [Desktop Optimization Pack](https://www.microsoft.com/en-us/download/details.aspx?id=56126) #### Steps to update the MBAM Server for existing MBAM environment -1. Remove MBAM server feature(do this by opening the MBAM Server Configuration Tool, then select Remove Features). +1. Remove MBAM server feature (do this by opening the MBAM Server Configuration Tool, then selecting Remove Features). 2. Remove MDOP MBAM from Control Panel | Programs and Features. 3. Install MBAM 2.5 SP1 RTM server components. 4. Install lastest MBAM 2.5 SP1 hotfix rollup. 5. Configure MBAM features using MBAM Server Configurator. #### Steps to install the new MBAM 2.5 SP1 server hotfix -Refer to the document for new [server installation](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/deploying-the-mbam-25-server-infrastructure). +Refer to the document for [new server installation](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/deploying-the-mbam-25-server-infrastructure). From b08d3ba242fcc1ff60890f274f79b12b0ab69dd1 Mon Sep 17 00:00:00 2001 From: jaimeo Date: Thu, 31 May 2018 11:15:23 -0700 Subject: [PATCH 10/11] fixing typo in link --- .../upgrade/upgrade-readiness-deployment-script.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/deployment/upgrade/upgrade-readiness-deployment-script.md b/windows/deployment/upgrade/upgrade-readiness-deployment-script.md index 0c431543e3..c28763cabf 100644 --- a/windows/deployment/upgrade/upgrade-readiness-deployment-script.md +++ b/windows/deployment/upgrade/upgrade-readiness-deployment-script.md @@ -146,7 +146,7 @@ The deployment script displays the following exit codes to let you know if it wa **Http Get** on the end points did not return a success exit code.
For Windows 10, connectivity is verified by connecting to https://v10.vortex-win.data.microsoft.com/health/keepalive.
For previous operating systems, connectivity is verified by connecting to https://vortex-win.data.microsoft.com/health/keepalive. -
If there is an error verifying connectivity, this will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enroll devices in Windows Analytics](../update/windows-analytics-get-started.md) +
If there is an error verifying connectivity, this will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enrolling devices in Windows Analytics](../update/windows-analytics-get-started.md) 13 - Can’t connect to Microsoft - setting. An error occurred connecting to https://settings.data.microsoft.com/qos. This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enrolling devices in Windows Analytics](https://technet.microsoft.com/en-us/itpro/windows/deploy/upgrade-readiness-get-started#enable-data-sharing). Verify that the required endpoints are whitelisted correctly. See Whitelist select endpoints for more details. @@ -154,11 +154,11 @@ The deployment script displays the following exit codes to let you know if it wa 14 - Can’t connect to Microsoft - compatexchange. - An error occurred connecting to [CompatibilityExchangeService.svc](https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc). This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enroll devices in Windows Analytics](../update/windows-analytics-get-started.md). + An error occurred connecting to [CompatibilityExchangeService.svc](https://compatexchange1.trafficmanager.net/CompatibilityExchangeService.svc). This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enrolling devices in Windows Analytics](../update/windows-analytics-get-started.md). 15 - Function CheckVortexConnectivity failed with an unexpected exception. - This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enroll devices in Windows Analytics](../update/windows-analytics-get-started.md). Check the logs for the exception message and the HResult. + This error will prevent the collected data from being sent to Upgrade Readiness. To resolve this issue, verify that the required endpoints are correctly whitelisted. For more information, see [Enrolling devices in Windows Analytics](../update/windows-analytics-get-started.md). Check the logs for the exception message and the HResult. 16 - The computer requires a reboot before running the script. From 90a6e463996553611b995256514000eca7e30ed0 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Thu, 31 May 2018 20:59:23 +0000 Subject: [PATCH 11/11] Merged PR 8667: fix merge conflict --- windows/configuration/guidelines-for-assigned-access-app.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/windows/configuration/guidelines-for-assigned-access-app.md b/windows/configuration/guidelines-for-assigned-access-app.md index 91b729e5c8..9e2edfd8e0 100644 --- a/windows/configuration/guidelines-for-assigned-access-app.md +++ b/windows/configuration/guidelines-for-assigned-access-app.md @@ -110,11 +110,7 @@ Entry | Result `contoso.com` | Blocks all requests to contoso.com, www.contoso.com, and sub.www.contoso.com `https://*` | Blocks all HTTPS requests to any domain. `mail.contoso.com` | Blocks requests to mail.contoso.com but not to www.contoso.com or contoso.com -<<<<<<< HEAD `.contoso.com` | Blocks contoso.com but not its subdomains, like subdomain.contoso.com. -======= -`.contoso.com` | Blocks contoso.com but not its subdomains, like contoso.com/docs. ->>>>>>> refs/remotes/origin/master `.www.contoso.com` | Blocks www.contoso.com but not its subdomains. `*` | Blocks all requests except for URLs in the Blocked URL Exceptions list. `*:8080` | Blocks all requests to port 8080.