Skip to content
Merged
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
4 changes: 3 additions & 1 deletion include/download-instructions/windows-downloads.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

function ws_build_label(string $k, array $entry): string {
$tool = 'VS';
if (strpos($k, 'vs17') !== false) {
if (strpos($k, 'vs18') !== false) {
$tool .= '18';
} elseif (strpos($k, 'vs17') !== false) {
$tool .= '17';
} elseif (strpos($k, 'vs16') !== false) {
$tool .= '16';
Expand Down
1 change: 1 addition & 0 deletions include/download-instructions/windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ Function Get-VSVersion {
'7.2' = 'VC15'; '7.3' = 'VC15'; '7.4' = 'vc15'
'8.0' = 'vs16'; '8.1' = 'vs16'; '8.2' = 'vs16'; '8.3' = 'vs16'
'8.4' = 'vs17'; '8.5' = 'vs17'
'8.6' = 'vs18';
}

if ($map.ContainsKey($Version)) {
Expand Down
4 changes: 3 additions & 1 deletion pre-release-builds.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@

$buildLabel = static function (string $key, array $entry): string {
$tool = 'VS';
if (strpos($key, 'vs17') !== false) {
if (strpos($key, 'vs18') !== false) {
$tool .= '18';
} elseif (strpos($key, 'vs17') !== false) {
$tool .= '17';
} elseif (strpos($key, 'vs16') !== false) {
$tool .= '16';
Expand Down