Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AppVeyor to know about VS 2019 #1039

Merged
merged 2 commits into from
May 16, 2020
Merged

Update AppVeyor to know about VS 2019 #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da445cd
Update AppVeyor to know about VS 2019
bhardwajs May 16, 2020
ceb1d1a
Update validate sets
chwarr May 16, 2020
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
3 changes: 3 additions & 0 deletions tools/ci-scripts/windows/ConvertTo-MsvcVersion.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function ToVcToolsetVer([string]$imageName)
'Visual Studio 2013' { '12.0' }
'Visual Studio 2015' { '14.0' }
'Visual Studio 2017' { '14.1' }
'Visual Studio 2019' { '14.2' }
default { throw "Unknown image name '$imageName'" }
}
}
Expand All @@ -48,6 +49,7 @@ function ToYear([string]$vcToolsetVer)
'12.0' { '2013' }
'14.0' { '2015' }
'14.1' { '2017' }
'14.2' { '2019' }
default { throw "Unknown VcToolsetVer '$vcToolsetVer'" }
}
}
Expand All @@ -59,6 +61,7 @@ function ToCMakeGeneratorNum([string]$vcToolsetVer)
'12.0' { '12' }
'14.0' { '14' }
'14.1' { '15' }
'14.2' { '16' }
default { throw "Unknown VcToolsetVer '$vcToolsetVer'" }
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/ci-scripts/windows/Get-BoostLocation.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ param
[string]
$Version,

[ValidateSet('12.0', '14.0', '14.1')]
[ValidateSet('12.0', '14.0', '14.1', '14.2')]
[string]
$VcToolsetVer
)
Expand Down
2 changes: 1 addition & 1 deletion tools/ci-scripts/windows/Install-Boost.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ param
[string]
$Version,

[ValidateSet('12.0', '14.0', '14.1')]
[ValidateSet('12.0', '14.0', '14.1', '14.2')]
[string]
$VcToolsetVer,

Expand Down