Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions common-npm-packages/msbuildhelpers/PathFunctions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -553,4 +553,4 @@ function Get-FeatureFlags {
}

return $featureFlags
}
}
2 changes: 1 addition & 1 deletion common-npm-packages/msbuildhelpers/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down