Revert search COM changes to common module

Author: ericsciple

Tasks/Common/MSBuildHelpers/PathFunctions.ps1

@@ -5,13 +5,15 @@ function Get-MSBuildPath {
     [CmdletBinding()]
     param(
         [string]$Version,
-        [string]$Architecture)
+        [string]$Architecture,
+        [switch]$SearchCom)
 
     Trace-VstsEnteringInvocation $MyInvocation
     try {
         # Attempt to find Microsoft.Build.Utilities.Core.dll from a VS 15 Willow install.
         [System.Reflection.Assembly]$msUtilities = $null
-        if (($visualStudio15 = Get-VisualStudio_15_0) -and
+        if ($SearchCom -and
+            ($visualStudio15 = Get-VisualStudio_15_0) -and
             $visualStudio15.Path) {
 
             $msbuildUtilitiesPath = [System.IO.Path]::Combine($visualStudio15.Path, "MSBuild\15.0\Bin\Microsoft.Build.Utilities.Core.dll")

Tasks/MSBuild/Select-MSBuildLocation.ps1

@@ -33,7 +33,7 @@ function Select-MSBuildLocation {
             # Look for a specific version of MSBuild.
             if ($Version -and "$Version".ToUpperInvariant() -ne 'LATEST') {
 
-                $Location = Get-MSBuildPath -Version $Version -Architecture $Architecture
+                $Location = Get-MSBuildPath -Version $Version -Architecture $Architecture -SearchCom
 
                 # Warn if not found.
                 if (!$Location) {
@@ -44,7 +44,7 @@ function Select-MSBuildLocation {
             # Look for the latest version of MSBuild.
             if (!$Location) {
                 Write-Verbose 'Searching for latest MSBuild version.'
-                $Location = Get-MSBuildPath -Version '' -Architecture $Architecture
+                $Location = Get-MSBuildPath -Version '' -Architecture $Architecture -SearchCom
 
                 # Throw if not found.
                 if (!$Location) {

Tasks/MSBuild/Tests/Select-MSBuildLocation.DefaultsMethodToVersionIfNoLocation.ps1

@@ -4,7 +4,7 @@ param()
 # Arrange.
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-MSBuildLocation.ps1
-Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture' -SearchCom
 
 # Act.
 $actual = Select-MSBuildLocation -Method '' -Location '' -Version '' -Architecture 'Some architecture'

Tasks/MSBuild/Tests/Select-MSBuildLocation.ReturnsLatestVersion.ps1

@@ -4,7 +4,7 @@ param()
 # Arrange.
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-MSBuildLocation.ps1
-Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture' -SearchCom
 foreach ($version in @('', 'latest')) {
     # Act.
     $actual = Select-MSBuildLocation -Method 'Version' -Location 'Some input location' -Version $version -Architecture 'Some architecture'

Tasks/MSBuild/Tests/Select-MSBuildLocation.ReturnsSpecifiedVersion.ps1

@@ -4,7 +4,7 @@ param()
 # Arrange.
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-MSBuildLocation.ps1
-Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '14.0' -Architecture 'Some architecture'
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '14.0' -Architecture 'Some architecture'-SearchCom
 
 # Act.
 $actual = Select-MSBuildLocation -Method 'Version' -Location 'Some input location' -Version '14.0' -Architecture 'Some architecture'

Tasks/MSBuild/Tests/Select-MSBuildLocation.RevertsToLatestVersionIfVersionNotFound.ps1

@@ -5,7 +5,7 @@ param()
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-MSBuildLocation.ps1
 Register-Mock Write-Warning
-Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture' -SearchCom
 
 # Act.
 $actual = Select-MSBuildLocation -Method 'Version' -Location '' -Version '15.0' -Architecture 'Some architecture'

Tasks/MSBuild/Tests/Select-MSBuildLocation.RevertsToVersionIfNoLocationSpecified.ps1

@@ -4,7 +4,7 @@ param()
 # Arrange.
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-MSBuildLocation.ps1
-Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture' -SearchCom
 
 # Act.
 $actual = Select-MSBuildLocation -Method 'Location' -Location '' -Version '' -Architecture 'Some architecture'

Tasks/MSBuild/task.json

@@ -12,7 +12,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 53
+        "Patch": 54
     },
     "demands": [
         "msbuild"

Tasks/MSBuild/task.loc.json

@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 53
+    "Patch": 54
   },
   "demands": [
     "msbuild"

Tasks/VSBuild/Select-MSBuildLocation.ps1

@@ -17,7 +17,7 @@ function Select-MSBuildLocation {
         }
 
         # Find the MSBuild location.
-        if (!($msBuildLocation = Get-MSBuildPath -Version $msBuildVersion -Architecture $Architecture)) {
+        if (!($msBuildLocation = Get-MSBuildPath -Version $msBuildVersion -Architecture $Architecture -SearchCom)) {
             throw (Get-VstsLocString -Key MSBuildNotFoundVersion0Architecture1 -ArgumentList $msBuildVersion, $Architecture)
         }