From 60080878e1a93cb2366d6a06fa662f4991626bcf Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Fri, 7 Jun 2019 10:49:43 +0100 Subject: [PATCH] Make it possible to build ScriptAnalyzer with PowerShell7 --- build.ps1 | 8 +++++++- build.psm1 | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index e0382f6cf..14e8a03ee 100644 --- a/build.ps1 +++ b/build.ps1 @@ -7,7 +7,7 @@ param( [switch]$All, [Parameter(ParameterSetName="BuildOne")] - [ValidateRange(3, 6)] + [ValidateRange(3, 7)] [int]$PSVersion = $PSVersionTable.PSVersion.Major, [Parameter(ParameterSetName="BuildOne")] @@ -36,6 +36,12 @@ param( [Parameter(ParameterSetName='Bootstrap')] [switch] $Bootstrap ) +BEGIN { + if ($PSVersion -gt 6) { + # due to netstandard2.0 we do not need to treat PS version 7 differently + $PSVersion = 6 + } +} END { Import-Module -Force (Join-Path $PSScriptRoot build.psm1) diff --git a/build.psm1 b/build.psm1 index 4a1290a8d..b7bffba05 100644 --- a/build.psm1 +++ b/build.psm1 @@ -144,6 +144,8 @@ function Start-ScriptAnalyzerBuild param ( [switch]$All, + # Note that 6 should also be chosen for PowerShell7 as both implement netstandard2.0 + # and we do not use features from netstandard2.1 [ValidateRange(3, 6)] [int]$PSVersion = $PSVersionTable.PSVersion.Major,