From cfd5adaf135ccfe2ade3bce43a00d27abd007b0a Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 9 Feb 2017 15:26:40 -0800
Subject: Improve WinSDK detection

---
 scripts/findTargetPlatformVersion.ps1 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/findTargetPlatformVersion.ps1 b/scripts/findTargetPlatformVersion.ps1
index e9d676724..d3dba73f1 100644
--- a/scripts/findTargetPlatformVersion.ps1
+++ b/scripts/findTargetPlatformVersion.ps1
@@ -15,15 +15,16 @@ foreach ($ProgramFiles in $CandidateProgramFiles)
         continue
     }
 
-    $win10sdkVersions = Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object
-    $win10sdkVersionCount = $win10sdkVersions.Length
+    $win10sdkVersions = @(Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object)
+    [array]::Reverse($win10sdkVersions) # Newest SDK first
 
-    if ($win10sdkVersionCount -eq 0)
+    foreach ($win10sdkV in $win10sdkVersions)
     {
-        continue
+        if (Test-Path "$folder\$win10sdkV\um\windows.h")
+        {
+            return $win10sdkV.ToString()
+        }
     }
-
-    return $win10sdkVersions[$win10sdkVersionCount - 1].ToString()
 }
 
 # Windows 8.1 SDK
-- 
cgit v1.2.3