From d4536cfb777cb08ab1007c08d7732b2dfb8d268d Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 19 Feb 2020 15:07:11 -0800 Subject: [PATCH] Make LTS package always not a preview (#11895) --- build.psm1 | 9 ++++++++- tools/packaging/packaging.psm1 | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.psm1 b/build.psm1 index bdc98a191f..dd9e3ad7da 100644 --- a/build.psm1 +++ b/build.psm1 @@ -205,9 +205,16 @@ function Test-IsPreview param( [parameter(Mandatory)] [string] - $Version + $Version, + + [switch]$IsLTS ) + if ($IsLTS.IsPresent) { + ## If we are building a LTS package, then never consider it preview. + return $false + } + return $Version -like '*-*' } diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 06e40538b7..751f4a8da5 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -775,7 +775,7 @@ function New-UnixPackage { } # Determine if the version is a preview version - $IsPreview = Test-IsPreview -Version $Version + $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS # Preview versions have preview in the name $Name = if($LTS) { @@ -1440,7 +1440,7 @@ function New-MacOSLauncher [switch]$LTS ) - $IsPreview = Test-IsPreview -Version $Version + $IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS $packageId = Get-MacOSPackageId -IsPreview:$IsPreview # Define folder for launcher application.