Merge branch 'Brendan-McCoy-patch-1'

NuGet · May 13, 2016 · 242b0ef · 242b0ef
2 parents 9c3132d + 413c8aa
commit 242b0ef
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/tools/Enable-LocalTestMe.ps1 b/tools/Enable-LocalTestMe.ps1
@@ -33,6 +33,15 @@ if(!$MakeCertPath) {
         $xArch = "x64"
     }
     $MakeCertPath = Join-Path $WinSDKDir "bin\$xArch\makecert.exe"
+
+    # If registry scan finds wrong path, try the Azure extension's makecert
+    if(!(Test-Path $MakeCertPath)) {
+        if($xArch = "x64"){
+            $MakeCertPath = ${env:ProgramFiles(x86)}/"Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\Microsoft Azure Data Lake Tools for Visual Studio 2015\2.0.6000.0\CppSDK\SDK\bin\makecert.exe"
+        } else {
+            $MakeCertPath = ${env:ProgramFiles}/"Microsoft Visual Studio 14.0\Common7\IDE\Extensions\Microsoft\Microsoft Azure Data Lake Tools for Visual Studio 2015\2.0.6000.0\CppSDK\SDK\bin\makecert.exe"
+        }
+    }
 }
 
 if(!(Test-Path $MakeCertPath)) {