Find 15.2 VS (#4525)

microsoft · Jun 13, 2017 · d4d078f · d4d078f
1 parent 030c1b9
commit d4d078f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/Tasks/Common/MSBuildHelpers/PathFunctions.ps1 b/Tasks/Common/MSBuildHelpers/PathFunctions.ps1
@@ -177,16 +177,13 @@ function Get-VisualStudio_15_0 {
     try {
         if (!$script:visualStudioCache.ContainsKey('15.0')) {
             try {
-                # Query for the latest 15.0.* version.
+                # Query for the latest 15.* version.
                 #
-                # Note, even though VS 15 Update 1 is sometimes referred to as "15.1", the actual installation
-                # version number is 15.0.26403.7.
-                #
-                # Also note, the capability is registered as VisualStudio_15.0, so the following code should
-                # query for 15.0.* versions only.
+                # Note, the capability is registered as VisualStudio_15.0, however the actual version
+                # may be something like 15.2.
                 Write-Verbose "Getting latest Visual Studio 15 setup instance."
                 $output = New-Object System.Text.StringBuilder
-                Invoke-VstsTool -FileName "$PSScriptRoot\vswhere.exe" -Arguments "-version [15.0,15.1) -latest -format json" -RequireExitCodeZero 2>&1 |
+                Invoke-VstsTool -FileName "$PSScriptRoot\vswhere.exe" -Arguments "-version [15.0,16.0) -latest -format json" -RequireExitCodeZero 2>&1 |
                     ForEach-Object {
                         if ($_ -is [System.Management.Automation.ErrorRecord]) {
                             Write-Verbose "STDERR: $($_.Exception.Message)"

diff --git a/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.CachesNotFoundResult.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.CachesNotFoundResult.ps1
@@ -10,7 +10,7 @@ Register-Mock Invoke-VstsTool {
         $script:vsCount++
         "["
         "]"
-    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,15.1) -latest -format json" -RequireExitCodeZero
+    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,16.0) -latest -format json" -RequireExitCodeZero
 Register-Mock Invoke-VstsTool {
         $script:buildToolsCount++
         "["

diff --git a/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.CachesResult.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.CachesResult.ps1
@@ -10,7 +10,7 @@ Register-Mock Invoke-VstsTool {
         "    `"installationPath`": `"path1`""
         "  }"
         "]"
-    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,15.1) -latest -format json" -RequireExitCodeZero
+    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,16.0) -latest -format json" -RequireExitCodeZero
 
 # Act.
 $null = Get-VisualStudio_15_0

diff --git a/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.FallsBackToBuildTools.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.FallsBackToBuildTools.ps1
@@ -9,7 +9,7 @@ $script:buildToolsCount = 0
 Register-Mock Invoke-VstsTool {
         $script:vsCount++
         "[]"
-    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,15.1) -latest -format json" -RequireExitCodeZero
+    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,16.0) -latest -format json" -RequireExitCodeZero
 Register-Mock Invoke-VstsTool {
         $script:buildToolsCount++
         "["

diff --git a/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.IgnoresStderr.ps1 b/Tasks/Common/MSBuildHelpers/Tests/Get-VisualStudio_15_0.IgnoresStderr.ps1
@@ -11,7 +11,7 @@ Register-Mock Invoke-VstsTool {
         "    `"installationPath`": `"some path`""
         "  }"
         "]"
-    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,15.1) -latest -format json" -RequireExitCodeZero
+    } -- -FileName (Resolve-Path $PSScriptRoot\..\vswhere.exe).Path -Arguments "-version [15.0,16.0) -latest -format json" -RequireExitCodeZero
 
 # Act.
 $actual = Get-VisualStudio_15_0

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