From 393254d3f9c77264161fa8404fa1672e2a478915 Mon Sep 17 00:00:00 2001 From: James Truher Date: Wed, 13 Mar 2019 14:09:04 -0700 Subject: [PATCH 1/7] Drop back to 2.1.4 for sdk in container --- tools/releaseBuild/Image/DockerFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; ` From 795690443cad4d7c651235d744195b5a338f1fcb Mon Sep 17 00:00:00 2001 From: James Truher Date: Wed, 13 Mar 2019 14:09:29 -0700 Subject: [PATCH 2/7] Don't take input for building, the release tag is never used --- tools/releaseBuild/vstsbuild.ps1 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/releaseBuild/vstsbuild.ps1 b/tools/releaseBuild/vstsbuild.ps1 index 2afd3fd23..f407ec946 100644 --- a/tools/releaseBuild/vstsbuild.ps1 +++ b/tools/releaseBuild/vstsbuild.ps1 @@ -1,10 +1,4 @@ [cmdletbinding()] -param( - [Parameter(Mandatory=$true,Position=0)] - [ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d+)?)?$")] - [string]$ReleaseTag -) - Begin { $ErrorActionPreference = 'Stop' @@ -54,13 +48,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 = @{ } # not needed for PSSA AdditionalFiles = $AdditionalFiles Name = "win7-x64" } From db129f4a1eeef3e7120e31315eb28fdef0660840 Mon Sep 17 00:00:00 2001 From: James Truher Date: Wed, 13 Mar 2019 14:09:52 -0700 Subject: [PATCH 3/7] Push version to 1.18.0 --- Engine/Engine.csproj | 2 +- Engine/PSScriptAnalyzer.psd1 | 2 +- Rules/Rules.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 From 3a39dccf8a36f53e6e4fd245fa4ef6b19385a888 Mon Sep 17 00:00:00 2001 From: James Truher Date: Wed, 13 Mar 2019 14:12:42 -0700 Subject: [PATCH 4/7] add param statement in vstsbuild script --- tools/releaseBuild/vstsbuild.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/releaseBuild/vstsbuild.ps1 b/tools/releaseBuild/vstsbuild.ps1 index f407ec946..f487e256d 100644 --- a/tools/releaseBuild/vstsbuild.ps1 +++ b/tools/releaseBuild/vstsbuild.ps1 @@ -1,4 +1,6 @@ [cmdletbinding()] +param ( ) + Begin { $ErrorActionPreference = 'Stop' From f74b28f04964b7356f29b4c9cbba3c10ef4e68e0 Mon Sep 17 00:00:00 2001 From: James Truher Date: Wed, 13 Mar 2019 14:22:29 -0700 Subject: [PATCH 5/7] add dummy ReleaseTag --- tools/releaseBuild/vstsbuild.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/vstsbuild.ps1 b/tools/releaseBuild/vstsbuild.ps1 index f487e256d..9faeedfa0 100644 --- a/tools/releaseBuild/vstsbuild.ps1 +++ b/tools/releaseBuild/vstsbuild.ps1 @@ -53,7 +53,7 @@ End { $buildArgs = @{ RepoPath = $resolvedRepoRoot BuildJsonPath = './tools/releaseBuild/build.json' - Parameters = @{ } # not needed for PSSA + Parameters = @{ ReleaseTag = "unused" } # not needed for PSSA AdditionalFiles = $AdditionalFiles Name = "win7-x64" } From dd353a0bc9f4f585b98689fdba4736b1be8b24c9 Mon Sep 17 00:00:00 2001 From: James Truher Date: Thu, 14 Mar 2019 14:01:31 -0700 Subject: [PATCH 6/7] Move up to sdk 2.1.9 --- tools/releaseBuild/Image/DockerFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/Image/DockerFile b/tools/releaseBuild/Image/DockerFile index 6f399de1c..4a1633009 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.1.4; ` + C:/dotnet-install.ps1 -Channel Release -Version 2.1.9; ` Add-Path C:/Users/ContainerAdministrator/AppData/Local/Microsoft/dotnet; RUN Import-Module ./containerFiles/dockerInstall.psm1; ` From 227e14caed0425094576e066d32667b0479494a4 Mon Sep 17 00:00:00 2001 From: James Truher Date: Thu, 14 Mar 2019 14:09:02 -0700 Subject: [PATCH 7/7] Revert "Move up to sdk 2.1.9" This reverts commit dd353a0bc9f4f585b98689fdba4736b1be8b24c9. --- tools/releaseBuild/Image/DockerFile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/Image/DockerFile b/tools/releaseBuild/Image/DockerFile index 4a1633009..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.1.9; ` + 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; `