From 4360f45ab84c83333134cd4a7cdd89135bd93625 Mon Sep 17 00:00:00 2001
From: "Sparer, David" <David.Sparer@pearson.com>
Date: Tue, 17 May 2016 13:50:20 -0600
Subject: [PATCH] - Custom action for checking if RDP8.0 is installed will only
 run on Win7 machines - Re-ordered conditional checks. Installer will warn
 about .Net version before warning about RDP 8.0 requirement. This more
 logically follows the "broad to specific" ordering of requirements

---
 Installer Projects/Installer/mRemoteNGV1.wxs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Installer Projects/Installer/mRemoteNGV1.wxs b/Installer Projects/Installer/mRemoteNGV1.wxs
index 93177c99b..23b84f9d3 100644
--- a/Installer Projects/Installer/mRemoteNGV1.wxs	
+++ b/Installer Projects/Installer/mRemoteNGV1.wxs	
@@ -22,7 +22,7 @@
 
     <InstallUISequence>
       <Custom Action="SetRDP80KBValue" After="AppSearch" />
-      <Custom Action="CheckIfRDP80Installed" After="SetRDP80KBValue" />
+      <Custom Action="CheckIfRDP80Installed" After="SetRDP80KBValue">NOT Installed AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
     </InstallUISequence>
     
     
@@ -38,14 +38,14 @@
     <Condition Message="!(loc.Install_Win7RequiresSP1)">
       <![CDATA[Installed OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) AND ServicePackLevel >= 1)]]>
     </Condition>
-    <!-- If Win7, require RDP 8.0 update (KB2592687) -->
-    <Condition Message="!(loc.Install_RDP80Requirement)">
-      <![CDATA[Installed OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) ]]>AND ($(var.RDP80KB) = 1 OR $(var.RDP81KB) = 1))
-    </Condition>
     <!-- .Net Framework Version Condition -->
     <Condition Message="!(loc.Install_NeedDotNetFrameworkVersion)">
       <![CDATA[Installed OR WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED = 1]]>
     </Condition>
+    <!-- If Win7, require RDP 8.0 update (KB2592687) -->
+    <Condition Message="!(loc.Install_RDP80Requirement)">
+      <![CDATA[Installed OR (VersionNT >= 602 OR VersionNT64 >= 602) OR ((VersionNT = 601 OR VersionNT64 = 601) ]]>AND ($(var.RDP80KB) = 1 OR $(var.RDP81KB) = 1))
+    </Condition>