diff --git a/common-npm-packages/msbuildhelpers/PathFunctions.ps1 b/common-npm-packages/msbuildhelpers/PathFunctions.ps1 index be3f91bf..45d04ace 100644 --- a/common-npm-packages/msbuildhelpers/PathFunctions.ps1 +++ b/common-npm-packages/msbuildhelpers/PathFunctions.ps1 @@ -21,7 +21,7 @@ function Get-MSBuildPath { # Only attempt to find Microsoft.Build.Utilities.Core.dll from a VS 15 Willow install # when "15.0" or latest is specified. In 15.0, the method GetPathToBuildToolsFile(...) # has regressed. When it is called for a version that is not found, the latest version - # found is returned instead. Same for "16.0" and "17.0" + # found is returned instead. Same for versions 16 and later i.e.: "16.0", "17.0", and "18.0". [System.Reflection.Assembly]$msUtilities = $null if (($VersionNumber -ge 16 -or !$Version) -and # !$Version indicates "latest" @@ -354,7 +354,7 @@ function Get-VisualStudio { [CmdletBinding()] param( [Parameter(Mandatory = $true)] - [ValidateSet(15, 16, 17)] + [ValidateSet(15, 16, 17, 18)] [int]$MajorVersion) Trace-VstsEnteringInvocation $MyInvocation @@ -455,7 +455,7 @@ function Select-MSBuildPath { } $specificVersion = $PreferredVersion -and $PreferredVersion -ne 'latest' - $versions = '17.0', '16.0', '15.0', '14.0', '12.0', '4.0' | Where-Object { $_ -ne $PreferredVersion } + $versions = '18.0', '17.0', '16.0', '15.0', '14.0', '12.0', '4.0' | Where-Object { $_ -ne $PreferredVersion } # Look for a specific version of MSBuild. if ($specificVersion) { @@ -553,4 +553,4 @@ function Get-FeatureFlags { } return $featureFlags -} \ No newline at end of file +} diff --git a/common-npm-packages/msbuildhelpers/package.json b/common-npm-packages/msbuildhelpers/package.json index bef09007..1465140e 100644 --- a/common-npm-packages/msbuildhelpers/package.json +++ b/common-npm-packages/msbuildhelpers/package.json @@ -1,6 +1,6 @@ { "name": "azure-pipelines-tasks-msbuildhelpers", - "version": "3.259.1", + "version": "3.260.0", "description": "Azure Pipelines tasks MSBuild helpers", "main": "msbuildhelpers.js", "scripts": {