Fallback to and from vs 15 (#4404)

microsoft · May 25, 2017 · fb7ec14 · fb7ec14
1 parent 4452d5b
commit fb7ec14
Show file tree

Hide file tree

Showing 20 changed files with 88 additions and 54 deletions.
diff --git a/Tasks/Common/MSBuildHelpers/PathFunctions.ps1 b/Tasks/Common/MSBuildHelpers/PathFunctions.ps1
@@ -252,14 +252,7 @@ function Select-MSBuildPath {
                 return $path
             }
 
-            # Do not fallback from 15.0.
-            if ($PreferredVersion -eq '15.0') {
-                Write-Error (Get-VstsLocString -Key 'MSB_MSBuild15NotFoundionArchitecture0' -ArgumentList $Architecture)
-                return
-            }
-
             # Attempt to fallback.
-            $versions = $versions | Where-Object { $_ -ne '15.0' } # Fallback is only between 14.0-4.0.
             Write-Verbose "Specified version '$PreferredVersion' and architecture '$Architecture' not found. Attempting to fallback."
         }
 

diff --git a/Tasks/Common/MSBuildHelpers/Tests/L0.ts b/Tasks/Common/MSBuildHelpers/Tests/L0.ts
@@ -93,21 +93,24 @@ describe('Common-MSBuildHelpers Suite', function () {
         it('(Select-MSBuildPath) defaults method to version if no location', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildPath.DefaultsMethodToVersionIfNoLocation.ps1'), done);
         })
-        it('(Select-MSBuildPath) does not fallback from 15', (done) => {
-            psr.run(path.join(__dirname, 'Select-MSBuildPath.DoesNotFallbackFrom15.ps1'), done);
-        })
         it('(Select-MSBuildPath) errors if version not found', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildPath.ErrorsIfVersionNotFound.ps1'), done);
         })
         it('(Select-MSBuildPath) falls back from 14', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildPath.FallsBackFrom14.ps1'), done);
         })
+        it('(Select-MSBuildPath) falls back from 15', (done) => {
+            psr.run(path.join(__dirname, 'Select-MSBuildPath.FallsBackFrom15.ps1'), done);
+        })
         it('(Select-MSBuildPath) falls back to version if no location specified', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildPath.FallsBackToVersionIfNoLocationSpecified.ps1'), done);
         })
         it('(Select-MSBuildPath) falls forward from 12', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildPath.FallsForwardFrom12.ps1'), done);
         })
+        it('(Select-MSBuildPath) falls forward from 14', (done) => {
+            psr.run(path.join(__dirname, 'Select-MSBuildPath.FallsForwardFrom14.ps1'), done);
+        })
         it('(Select-MSBuildPath) returns latest version', (done) => {
             psr.run(path.join(__dirname, 'Select-MSBuildPath.ReturnsLatestVersion.ps1'), done);
         })

diff --git a/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.DoesNotFallbackFrom15.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.DoesNotFallbackFrom15.ps1
diff --git a/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsBackFrom14.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsBackFrom14.ps1
@@ -12,5 +12,5 @@ $actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '1
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-MSBuildPath -Times 2
+Assert-WasCalled Get-MSBuildPath -Times 3
 Assert-AreEqual -Expected 'Some resolved location' -Actual $actual
diff --git a/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsBackFrom15.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsBackFrom15.ps1
@@ -0,0 +1,16 @@
+[cmdletbinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\..\Tests\lib\Initialize-Test.ps1
+Microsoft.PowerShell.Core\Import-Module $PSScriptRoot\..
+Register-Mock Write-Warning
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '14.0' -Architecture 'Some architecture'
+
+# Act.
+$actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '15.0' -Architecture 'Some architecture'
+
+# Assert.
+Assert-WasCalled Write-Warning
+Assert-WasCalled Get-MSBuildPath -Times 2
+Assert-AreEqual -Expected 'Some resolved location' -Actual $actual
diff --git a/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsForwardFrom12.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsForwardFrom12.ps1
@@ -12,5 +12,5 @@ $actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '1
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-MSBuildPath -Times 2
+Assert-WasCalled Get-MSBuildPath -Times 3
 Assert-AreEqual -Expected 'Some resolved location' -Actual $actual
diff --git a/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsForwardFrom14.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Select-MSBuildPath.FallsForwardFrom14.ps1
@@ -0,0 +1,16 @@
+[cmdletbinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\..\Tests\lib\Initialize-Test.ps1
+Microsoft.PowerShell.Core\Import-Module $PSScriptRoot\..
+Register-Mock Write-Warning
+Register-Mock Get-MSBuildPath { 'Some resolved location' } -- -Version '15.0' -Architecture 'Some architecture'
+
+# Act.
+$actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '14.0' -Architecture 'Some architecture'
+
+# Assert.
+Assert-WasCalled Write-Warning
+Assert-WasCalled Get-MSBuildPath -Times 2
+Assert-AreEqual -Expected 'Some resolved location' -Actual $actual
diff --git a/Tasks/MSBuild/task.json b/Tasks/MSBuild/task.json
@@ -11,8 +11,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 117,
-        "Patch": 1
+        "Minor": 118,
+        "Patch": 0
     },
     "demands": [
         "msbuild"

diff --git a/Tasks/MSBuild/task.loc.json b/Tasks/MSBuild/task.loc.json
@@ -11,8 +11,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 117,
-    "Patch": 1
+    "Minor": 118,
+    "Patch": 0
   },
   "demands": [
     "msbuild"

diff --git a/Tasks/VSBuild/Select-VSVersion.ps1 b/Tasks/VSBuild/Select-VSVersion.ps1
@@ -13,13 +13,7 @@ function Select-VSVersion {
                 return $PreferredVersion
             }
 
-            # Error. Do not fallback from 15.0.
-            if ($PreferredVersion -eq '15.0') {
-                throw (Get-VstsLocString -Key 'VSVersion15NotFound' -ArgumentList $PreferredVersion)
-            }
-
             # Attempt to fallback.
-            $versions = $versions | Where-Object { $_ -ne '15.0' } # Fallback is only between 14.0-10.0.
             Write-Verbose "Version '$PreferredVersion' not found. Looking for fallback version."
         }
 

diff --git a/Tasks/VSBuild/Tests/L0.ts b/Tasks/VSBuild/Tests/L0.ts
@@ -27,15 +27,18 @@ describe('VSBuild Suite', function () {
     });
 
     if (psm.testSupported()) {
-        it('(Select-VSVersion) errors if 15 not found', (done) => {
-            psr.run(path.join(__dirname, 'Select-VSVersion.ErrorsIf15NotFound.ps1'), done);
-        })
         it('(Select-VSVersion) falls back from 14', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FallsBackFrom14.ps1'), done);
         })
+        it('(Select-VSVersion) falls back from 15', (done) => {
+            psr.run(path.join(__dirname, 'Select-VSVersion.FallsBackFrom15.ps1'), done);
+        })
         it('(Select-VSVersion) falls forward from 12', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FallsForwardFrom12.ps1'), done);
         })
+        it('(Select-VSVersion) falls forward from 14', (done) => {
+            psr.run(path.join(__dirname, 'Select-VSVersion.FallsForwardFrom14.ps1'), done);
+        })
         it('(Select-VSVersion) finds latest', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FindsLatest.ps1'), done);
         })

diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.ErrorsIf15NotFound.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.ErrorsIf15NotFound.ps1
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FallsBackFrom14.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FallsBackFrom14.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '14.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 2
+Assert-WasCalled Get-VSPath -Times 3
 Assert-AreEqual -Expected '12.0' -Actual $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FallsBackFrom15.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FallsBackFrom15.ps1
@@ -0,0 +1,16 @@
+[CmdletBinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\Select-VSVersion.ps1
+Register-Mock Write-Warning
+Register-Mock Get-VSPath { "Some resolved location" } -- -Version '14.0'
+
+# Act.
+$actual = Select-VSVersion -PreferredVersion '15.0'
+
+# Assert.
+Assert-WasCalled Write-Warning
+Assert-WasCalled Get-VSPath -Times 2
+Assert-AreEqual -Expected '14.0' -Actual $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FallsForwardFrom12.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FallsForwardFrom12.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '12.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 2
+Assert-WasCalled Get-VSPath -Times 3
 Assert-AreEqual -Expected '14.0' -Actual $actual
diff --git a/Tasks/VSBuild/Tests/Select-VSVersion.FallsForwardFrom14.ps1 b/Tasks/VSBuild/Tests/Select-VSVersion.FallsForwardFrom14.ps1
@@ -0,0 +1,16 @@
+[CmdletBinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\Select-VSVersion.ps1
+Register-Mock Write-Warning
+Register-Mock Get-VSPath { "Some resolved location" } -- -Version '15.0'
+
+# Act.
+$actual = Select-VSVersion -PreferredVersion '14.0'
+
+# Assert.
+Assert-WasCalled Write-Warning
+Assert-WasCalled Get-VSPath -Times 2
+Assert-AreEqual -Expected '15.0' -Actual $actual
diff --git a/Tasks/VSBuild/task.json b/Tasks/VSBuild/task.json
@@ -11,7 +11,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 117,
+        "Minor": 118,
         "Patch": 0
     },
     "demands": [

diff --git a/Tasks/VSBuild/task.loc.json b/Tasks/VSBuild/task.loc.json
@@ -11,7 +11,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 117,
+    "Minor": 118,
     "Patch": 0
   },
   "demands": [

diff --git a/Tasks/XamarinAndroid/task.json b/Tasks/XamarinAndroid/task.json
@@ -11,7 +11,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 117,
+        "Minor": 118,
         "Patch": 0
     },
     "demands": [

diff --git a/Tasks/XamarinAndroid/task.loc.json b/Tasks/XamarinAndroid/task.loc.json
@@ -11,7 +11,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 117,
+    "Minor": 118,
     "Patch": 0
   },
   "demands": [