diff --git a/extension-manifest.json b/extension-manifest.json index 0e1e5d2..6a92d79 100644 --- 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 index 761f9d1..6ba0056 100644 --- 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 index dc193fe..7fc4dd3 100644 --- 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\")) } }