diff --git a/Engine/Engine.csproj b/Engine/Engine.csproj index 970bc7990..dab8837f5 100644 --- a/Engine/Engine.csproj +++ b/Engine/Engine.csproj @@ -1,7 +1,7 @@  - 1.17.1 + 1.18.0 netstandard2.0;net452 Microsoft.Windows.PowerShell.ScriptAnalyzer Engine diff --git a/Engine/PSScriptAnalyzer.psd1 b/Engine/PSScriptAnalyzer.psd1 index 91803ccaa..b53409628 100644 --- a/Engine/PSScriptAnalyzer.psd1 +++ b/Engine/PSScriptAnalyzer.psd1 @@ -11,7 +11,7 @@ Author = 'Microsoft Corporation' RootModule = 'PSScriptAnalyzer.psm1' # Version number of this module. -ModuleVersion = '1.17.1' +ModuleVersion = '1.18.0' # ID used to uniquely identify this module GUID = 'd6245802-193d-4068-a631-8863a4342a18' diff --git a/Rules/Rules.csproj b/Rules/Rules.csproj index 731b150e4..10ac42795 100644 --- a/Rules/Rules.csproj +++ b/Rules/Rules.csproj @@ -1,7 +1,7 @@  - 1.17.1 + 1.18.0 netstandard2.0;net452 Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules Rules diff --git a/tools/releaseBuild/Image/DockerFile b/tools/releaseBuild/Image/DockerFile index 3d020ca87..6f399de1c 100644 --- a/tools/releaseBuild/Image/DockerFile +++ b/tools/releaseBuild/Image/DockerFile @@ -18,7 +18,7 @@ RUN Import-Module PackageManagement; ` Install-ChocolateyPackage -PackageName nuget.commandline -Executable nuget.exe -Cleanup; ` Install-Module -Force -Name platyPS; ` Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1 -outfile C:/dotnet-install.ps1; ` - C:/dotnet-install.ps1 -Channel Release -Version 2.2.3; ` + C:/dotnet-install.ps1 -Channel Release -Version 2.1.4; ` Add-Path C:/Users/ContainerAdministrator/AppData/Local/Microsoft/dotnet; RUN Import-Module ./containerFiles/dockerInstall.psm1; ` diff --git a/tools/releaseBuild/vstsbuild.ps1 b/tools/releaseBuild/vstsbuild.ps1 index 2afd3fd23..9faeedfa0 100644 --- a/tools/releaseBuild/vstsbuild.ps1 +++ b/tools/releaseBuild/vstsbuild.ps1 @@ -1,9 +1,5 @@ [cmdletbinding()] -param( - [Parameter(Mandatory=$true,Position=0)] - [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")] - [string]$ReleaseTag -) +param ( ) Begin { @@ -54,13 +50,10 @@ End { Write-Verbose "Starting build at $resolvedRepoRoot ..." -Verbose Clear-VstsTaskState - $buildParameters = @{ - ReleaseTag = $ReleaseTag - } $buildArgs = @{ RepoPath = $resolvedRepoRoot BuildJsonPath = './tools/releaseBuild/build.json' - Parameters = $buildParameters + Parameters = @{ ReleaseTag = "unused" } # not needed for PSSA AdditionalFiles = $AdditionalFiles Name = "win7-x64" }