Added 32 bit path to probe for TFS Client Object Model assemblies.

jessehouwing · Feb 22, 2016 · 58052c5 · 58052c5
1 parent 7793b61
commit 58052c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/extension-manifest.json b/extension-manifest.json
@@ -2,7 +2,7 @@
     "manifestVersion":  1,
     "id":  "jessehouwing-vsts-tfvc-tasks",
     "name":  "TFVC Build Tasks",
-    "version":  "1.0.23",
+    "version":  "1.0.26",
     "publisher":  "jessehouwing",
     "public":  true,
     "targets":  [

diff --git a/vsts-tfvc-add/TfvcAdd.ps1 b/vsts-tfvc-add/TfvcAdd.ps1
@@ -36,10 +36,16 @@ function Load-Assembly
             $ProbingPaths.Add($env:AGENT_SERVEROMDIRECTORY)
         }
 
-        $VS14Path = (Get-ItemProperty -LiteralPath "HKLM:\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0" -Name 'ShellFolder' -ErrorAction Ignore).ShellFolder
-        if ($VS14Path -ne $null)
+        $VS1454Path = (Get-ItemProperty -LiteralPath "HKLM:\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0" -Name 'ShellFolder' -ErrorAction Ignore).ShellFolder
+        if ($VS1464Path -ne $null)
         {
-            $ProbingPaths.Add((Join-Path $VS14Path "\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\"))
+            $ProbingPaths.Add((Join-Path $VS1464Path "\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\"))
+        }
+
+        $VS1432Path = (Get-ItemProperty -LiteralPath "HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0" -Name 'ShellFolder' -ErrorAction Ignore).ShellFolder
+        if ($VS1432Path -ne $null)
+        {
+            $ProbingPaths.Add((Join-Path $VS1432Path "\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\"))
         }
     }
 

diff --git a/vsts-tfvc-checkin/TfvcCheckin.ps1 b/vsts-tfvc-checkin/TfvcCheckin.ps1
@@ -45,10 +45,16 @@ function Load-Assembly
             $ProbingPaths.Add($env:AGENT_SERVEROMDIRECTORY)
         }
 
-        $VS14Path = (Get-ItemProperty -LiteralPath "HKLM:\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0" -Name 'ShellFolder' -ErrorAction Ignore).ShellFolder
-        if ($VS14Path -ne $null)
+        $VS1454Path = (Get-ItemProperty -LiteralPath "HKLM:\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0" -Name 'ShellFolder' -ErrorAction Ignore).ShellFolder
+        if ($VS1464Path -ne $null)
         {
-            $ProbingPaths.Add((Join-Path $VS14Path "\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\"))
+            $ProbingPaths.Add((Join-Path $VS1464Path "\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\"))
+        }
+
+        $VS1432Path = (Get-ItemProperty -LiteralPath "HKLM:\SOFTWARE\Microsoft\VisualStudio\14.0" -Name 'ShellFolder' -ErrorAction Ignore).ShellFolder
+        if ($VS1432Path -ne $null)
+        {
+            $ProbingPaths.Add((Join-Path $VS1432Path "\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\"))
         }
     }