Search Willow for VS by default

ericsciple · ericsciple · commit 035480962b62 · 2017-01-11T16:28:57.000-05:00
diff --git a/Tasks/Common/MSBuildHelpers/PathFunctions.ps1 b/Tasks/Common/MSBuildHelpers/PathFunctions.ps1
@@ -5,15 +5,13 @@ function Get-MSBuildPath {
     [CmdletBinding()]
     param(
         [string]$Version,
-        [string]$Architecture,
-        [switch]$SearchCom)
+        [string]$Architecture)
 
     Trace-VstsEnteringInvocation $MyInvocation
     try {
         # Attempt to find Microsoft.Build.Utilities.Core.dll from a VS 15 Willow install.
         [System.Reflection.Assembly]$msUtilities = $null
-        if ($SearchCom -and
-            ($visualStudio15 = Get-VisualStudio_15_0) -and
+        if (($visualStudio15 = Get-VisualStudio_15_0) -and
             $visualStudio15.Path) {
 
             $msbuildUtilitiesPath = [System.IO.Path]::Combine($visualStudio15.Path, "MSBuild\15.0\Bin\Microsoft.Build.Utilities.Core.dll")
diff --git a/Tasks/MSBuild/Select-MSBuildLocation.ps1 b/Tasks/MSBuild/Select-MSBuildLocation.ps1
@@ -33,10 +33,7 @@ function Select-MSBuildLocation {
             # Look for a specific version of MSBuild.
             if ($Version -and "$Version".ToUpperInvariant() -ne 'LATEST') {
 
-                # Only search Willow installs if 15.0 was explicitly chosen.
-                $searchCom = $Version -eq "15.0"
-
-                $Location = Get-MSBuildPath -Version $Version -Architecture $Architecture -SearchCom:$searchCom
+                $Location = Get-MSBuildPath -Version $Version -Architecture $Architecture
 
                 # Warn if not found.
                 if (!$Location) {
@@ -47,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 -SearchCom:$false
+                $Location = Get-MSBuildPath -Version '' -Architecture $Architecture
 
                 # Throw if not found.
                 if (!$Location) {
diff --git a/Tasks/MSBuild/Tests/L0.ts b/Tasks/MSBuild/Tests/L0.ts
@@ -45,9 +45,6 @@ describe('MSBuild Suite', function () {
         it('(Select-MSBuildLocation) reverts to version if no location specified', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildLocation.RevertsToVersionIfNoLocationSpecified.ps1'), done);
         })
-        it('(Select-MSBuildLocation) searches COM for version 15', (done) => {
-            psr.run(path.join(__dirname, 'Select-MSBuildLocation.SearchesComForVersion15.ps1'), done);
-        })
         it('(Select-MSBuildLocation) throws if version not found', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildLocation.ThrowsIfVersionNotFound.ps1'), done);
         })
diff --git a/Tasks/MSBuild/Tests/Select-MSBuildLocation.DefaultsMethodToVersionIfNoLocation.ps1 b/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' -SearchCom: $false # Should not search COM since version is not 15.0.
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
 
 # Act.
 $actual = Select-MSBuildLocation -Method '' -Location '' -Version '' -Architecture 'Some architecture'
diff --git a/Tasks/MSBuild/Tests/Select-MSBuildLocation.ReturnsLatestVersion.ps1 b/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' -SearchCom: $false # Should not search COM since version is not 15.0.
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
 foreach ($version in @('', 'latest')) {
     # Act.
     $actual = Select-MSBuildLocation -Method 'Version' -Location 'Some input location' -Version $version -Architecture 'Some architecture'
diff --git a/Tasks/MSBuild/Tests/Select-MSBuildLocation.ReturnsSpecifiedVersion.ps1 b/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' -SearchCom: $false # Should not search COM since version is not 15.0.
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '14.0' -Architecture 'Some architecture'
 
 # Act.
 $actual = Select-MSBuildLocation -Method 'Version' -Location 'Some input location' -Version '14.0' -Architecture 'Some architecture'
diff --git a/Tasks/MSBuild/Tests/Select-MSBuildLocation.RevertsToLatestVersionIfVersionNotFound.ps1 b/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' -SearchCom: $false # Should not search COM when falling back to latest.
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
 
 # Act.
 $actual = Select-MSBuildLocation -Method 'Version' -Location '' -Version '15.0' -Architecture 'Some architecture'
diff --git a/Tasks/MSBuild/Tests/Select-MSBuildLocation.RevertsToVersionIfNoLocationSpecified.ps1 b/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' -SearchCom: $false # Should not search COM version is not 15.0.
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '' -Architecture 'Some architecture'
 
 # Act.
 $actual = Select-MSBuildLocation -Method 'Location' -Location '' -Version '' -Architecture 'Some architecture'
diff --git a/Tasks/MSBuild/Tests/Select-MSBuildLocation.SearchesComForVersion15.ps1 b/Tasks/MSBuild/Tests/Select-MSBuildLocation.SearchesComForVersion15.ps1
diff --git a/Tasks/VSBuild/Get-VSPath.ps1 b/Tasks/VSBuild/Get-VSPath.ps1
@@ -2,15 +2,12 @@ function Get-VSPath {
     [CmdletBinding()]
     param(
         [Parameter(Mandatory = $true)]
-        [string]$Version,
-
-        [switch]$SearchCom)
+        [string]$Version)
 
     Trace-VstsEnteringInvocation $MyInvocation
     try {
         # Search for a 15.0 Willow instance.
-        if ($SearchCom -and
-            $Version -eq "15.0" -and
+        if ($Version -eq "15.0" -and
             ($instance = Get-VisualStudio_15_0) -and
             $instance.Path) {
 
diff --git a/Tasks/VSBuild/Select-MSBuildLocation.ps1 b/Tasks/VSBuild/Select-MSBuildLocation.ps1
@@ -1,6 +1,6 @@
 function Select-MSBuildLocation {
     [CmdletBinding()]
-    param([string]$VSVersion, [string]$Architecture, [switch]$SearchCom)
+    param([string]$VSVersion, [string]$Architecture)
 
     Trace-VstsEnteringInvocation $MyInvocation
     try {
@@ -17,7 +17,7 @@ function Select-MSBuildLocation {
         }
 
         # Find the MSBuild location.
-        if (!($msBuildLocation = Get-MSBuildPath -Version $msBuildVersion -Architecture $Architecture -SearchCom:$SearchCom)) {
+        if (!($msBuildLocation = Get-MSBuildPath -Version $msBuildVersion -Architecture $Architecture)) {
             throw (Get-VstsLocString -Key MSBuildNotFoundVersion0Architecture1 -ArgumentList $msBuildVersion, $Architecture)
         }
 
diff --git a/Tasks/VSBuild/Select-VSVersion.ps1 b/Tasks/VSBuild/Select-VSVersion.ps1
@@ -1,12 +1,12 @@
 function Select-VSVersion {
     [CmdletBinding()]
-    param([string]$PreferredVersion, [switch]$SearchCom)
+    param([string]$PreferredVersion)
 
     Trace-VstsEnteringInvocation $MyInvocation
     try {
         # Look for a specific version of Visual Studio.
         if ($PreferredVersion -and $PreferredVersion -ne 'latest') {
-            if ((Get-VSPath -Version $PreferredVersion -SearchCom:$SearchCom)) {
+            if ((Get-VSPath -Version $PreferredVersion)) {
                 return $PreferredVersion
             }
 
@@ -17,7 +17,7 @@ function Select-VSVersion {
         [string[]]$knownVersions = '15.0', '14.0', '12.0', '11.0', '10.0' |
             Where-Object { $_ -ne $PreferredVersion }
         foreach ($version in $knownVersions) {
-            if ((Get-VSPath -Version $version -SearchCom:$SearchCom)) {
+            if ((Get-VSPath -Version $version)) {
                 return $version
             }
         }
diff --git a/Tasks/VSBuild/Tests/PassesArguments.ps1 b/Tasks/VSBuild/Tests/PassesArguments.ps1
@@ -5,14 +5,12 @@ param()
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 $variableSets = @(
     # Variable combinations to assert Booleans are passed correctly.
-    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $true ; VSVersion = '14.0' ; ExpectedSearchCom = $false }
-    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $true ; CreateLogFile = $false ; VSVersion = '14.0' ; ExpectedSearchCom = $false }
-    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $true ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '14.0' ; ExpectedSearchCom = $false }
-    @{ Clean = $false ; MaximumCpuCount = $true ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '14.0' ; ExpectedSearchCom = $false }
-    @{ Clean = $true ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '14.0' ; ExpectedSearchCom = $false }
-    # Variable combinations to assert COM is searched only when 15.0 is explicitly selected
-    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '15.0' ; ExpectedSearchCom = $true }
-    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = 'latest' ; ExpectedSearchCom = $false }
+    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $true ; VSVersion = '14.0' }
+    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $true ; CreateLogFile = $false ; VSVersion = '14.0' }
+    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $true ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '14.0' }
+    @{ Clean = $false ; MaximumCpuCount = $true ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '14.0' }
+    @{ Clean = $true ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = '14.0' }
+    @{ Clean = $false ; MaximumCpuCount = $false ; RestoreNugetPackages = $false ; LogProjectEvents = $false ; CreateLogFile = $false ; VSVersion = 'latest' }
 )
 foreach ($variableSet in $variableSets) {
     Unregister-Mock Get-VstsInput
@@ -33,8 +31,8 @@ foreach ($variableSet in $variableSets) {
     Register-Mock Get-VstsInput { $variableSet.LogProjectEvents } -- -Name LogProjectEvents -AsBool
     Register-Mock Get-VstsInput { $variableSet.CreateLogFile } -- -Name CreateLogFile -AsBool
     Register-Mock Get-SolutionFiles { 'Some solution 1', 'Some solution 2' } -- -Solution 'Some input solution'
-    Register-Mock Select-VSVersion { 'Some VS version' } -- -PreferredVersion $variableSet.VSVersion -SearchCom: $variableSet.ExpectedSearchCom
-    Register-Mock Select-MSBuildLocation { 'Some MSBuild location' } -- -VSVersion 'Some VS version' -Architecture 'Some input architecture' -SearchCom: $variableSet.ExpectedSearchCom
+    Register-Mock Select-VSVersion { 'Some VS version' } -- -PreferredVersion $variableSet.VSVersion
+    Register-Mock Select-MSBuildLocation { 'Some MSBuild location' } -- -VSVersion 'Some VS version' -Architecture 'Some input architecture'
     Register-Mock Format-MSBuildArguments { 'Some formatted arguments' } -- -MSBuildArguments 'Some input arguments' -Platform 'Some input platform' -Configuration 'Some input configuration' -VSVersion 'Some VS version' -MaximumCpuCount: $variableSet.MaximumCpuCount
     Register-Mock Invoke-BuildTools { 'Some build output' }
 
diff --git a/Tasks/VSBuild/Tests/Select-MSBuildLocation.MapsVSVersions.ps1 b/Tasks/VSBuild/Tests/Select-MSBuildLocation.MapsVSVersions.ps1
@@ -5,20 +5,19 @@ param()
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-MSBuildLocation.ps1
 $mappings = @(
-    @{ VSVersion = '' ; MSBuildVersion = '' ; SearchCom = $false }
-    @{ VSVersion = '15.0' ; MSBuildVersion = '15.0' ; SearchCom = $false }
-    @{ VSVersion = '15.0' ; MSBuildVersion = '15.0' ; SearchCom = $true }
-    @{ VSVersion = '14.0' ; MSBuildVersion = '14.0' ; SearchCom = $false }
-    @{ VSVersion = '12.0' ; MSBuildVersion = '12.0' ; SearchCom = $false }
-    @{ VSVersion = '11.0' ; MSBuildVersion = '4.0' ; SearchCom = $false }
-    @{ VSVersion = '10.0' ; MSBuildVersion = '4.0' ; SearchCom = $false }
+    @{ VSVersion = '' ; MSBuildVersion = '' }
+    @{ VSVersion = '15.0' ; MSBuildVersion = '15.0' }
+    @{ VSVersion = '14.0' ; MSBuildVersion = '14.0' }
+    @{ VSVersion = '12.0' ; MSBuildVersion = '12.0' }
+    @{ VSVersion = '11.0' ; MSBuildVersion = '4.0' }
+    @{ VSVersion = '10.0' ; MSBuildVersion = '4.0' }
 )
 foreach ($mapping in $mappings) {
     Unregister-Mock Get-MSBuildPath
-    Register-Mock Get-MSBuildPath { "Some location" } -- -Version $mapping.MSBuildVersion -Architecture 'Some architecture' -SearchCom: $mapping.SearchCom
+    Register-Mock Get-MSBuildPath { "Some location" } -- -Version $mapping.MSBuildVersion -Architecture 'Some architecture'
     
     # Act.
-    $actual = Select-MSBuildLocation -VSVersion $mapping.VSVersion -Architecture 'Some architecture' -SearchCom:$mapping.SearchCom
+    $actual = Select-MSBuildLocation -VSVersion $mapping.VSVersion -Architecture 'Some architecture'
 
     # Assert.
     Assert-AreEqual 'Some location' $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FallsBackToLatest.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FallsBackToLatest.ps1
@@ -5,10 +5,10 @@ param()
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-VSVersion.ps1
 Register-Mock Write-Warning
-Register-Mock Get-VSPath { "Some location" } -- -Version '15.0' -SearchCom:$false
+Register-Mock Get-VSPath { "Some location" } -- -Version '15.0'
 
 # Act.
-$actual = Select-VSVersion -PreferredVersion '16.0' -SearchCom:$false
+$actual = Select-VSVersion -PreferredVersion '16.0'
 
 # Assert.
 Assert-AreEqual '15.0' $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FindsLatest.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FindsLatest.ps1
@@ -9,10 +9,10 @@ $knownVersions = '10.0', '11.0', '12.0', '14.0', '15.0' # Registered in ascendin
 foreach ($preferredVersion in $preferredVersions) {
     Unregister-Mock Get-VSPath
     foreach ($knownVersion in $knownVersions) {
-        Register-Mock Get-VSPath { "Some location" } -- -Version $knownVersion -SearchCom: $false
+        Register-Mock Get-VSPath { "Some location" } -- -Version $knownVersion
 
         # Act.
-        $actual = Select-VSVersion -PreferredVersion $preferredVersion -SearchCom:$false
+        $actual = Select-VSVersion -PreferredVersion $preferredVersion
 
         # Assert.
         Assert-AreEqual $knownVersion $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FindsPreferred.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FindsPreferred.ps1
@@ -4,10 +4,10 @@ param()
 # Arrange.
 . $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
 . $PSScriptRoot\..\Select-VSVersion.ps1
-Register-Mock Get-VSPath { 'Some location' } -- -Version 'Some preferred version' -SearchCom:$false
+Register-Mock Get-VSPath { 'Some location' } -- -Version 'Some preferred version'
 
 # Act.
-$actual = Select-VSVersion -PreferredVersion 'Some preferred version' -SearchCom:$false
+$actual = Select-VSVersion -PreferredVersion 'Some preferred version'
 
 # Assert.
 Assert-AreEqual 'Some preferred version' $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.WarnsIfVSNotFound.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.WarnsIfVSNotFound.ps1
@@ -8,7 +8,7 @@ Register-Mock Write-Warning
 Register-Mock Get-VSPath
 
 # Act.
-$actual = Select-VSVersion -PreferredVersion '' -SearchCom:$false
+$actual = Select-VSVersion -PreferredVersion ''
 
 # Assert.
 Assert-AreEqual '' $actual
diff --git a/Tasks/VSBuild/VSBuild.ps1 b/Tasks/VSBuild/VSBuild.ps1
@@ -43,14 +43,11 @@ try {
     # Resolve match patterns.
     $solutionFiles = Get-SolutionFiles -Solution $Solution
 
-    # Only search Willow installs if 15.0 was explicitly chosen.
-    $searchCom = $vsVersion -eq "15.0"
-
     # Resolve a VS version.
-    $vsVersion = Select-VSVersion -PreferredVersion $vsVersion -SearchCom:$searchCom
+    $vsVersion = Select-VSVersion -PreferredVersion $vsVersion
 
     # Resolve the corresponding MSBuild location.
-    $msBuildLocation = Select-MSBuildLocation -VSVersion $vsVersion -Architecture $msBuildArchitecture -SearchCom:$searchCom
+    $msBuildLocation = Select-MSBuildLocation -VSVersion $vsVersion -Architecture $msBuildArchitecture
 
     # Format the MSBuild args.
     $MSBuildArgs = Format-MSBuildArguments -MSBuildArguments $MSBuildArgs -Platform $Platform -Configuration $Configuration -VSVersion $VSVersion -MaximumCpuCount:$maximumCpuCount
