From b19aa28e410902526282f121d06d6549cbd6e2b6 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:09:59 +0300 Subject: [PATCH 1/7] build with powershell 5 and 7 --- SnipeitPS.build.ps1 | 17 ++++++++--------- SnipeitPS/SnipeitPS.psd1 | 2 +- appveyor.yml | 39 ++++++++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/SnipeitPS.build.ps1 b/SnipeitPS.build.ps1 index 03a623d..48a0ac9 100644 --- a/SnipeitPS.build.ps1 +++ b/SnipeitPS.build.ps1 @@ -88,15 +88,14 @@ task GitStatus -If (Test-Path .git) { } } -task TestVersions TestPS3, TestPS4, TestPS4, TestPS5 -task TestPS3 { - exec {powershell.exe -Version 3 -NoProfile Invoke-Build PesterTests} -} -task TestPS4 { - exec {powershell.exe -Version 4 -NoProfile Invoke-Build PesterTests} -} -task TestPS5 { - exec {powershell.exe -Version 5 -NoProfile Invoke-Build PesterTests} +task TestVersions TestPS + +task TestPS { + if($env:PShell -eq '7') { + exec {pwsh.exe -NoProfile Invoke-Build PesterTests} + }else { + exec {powershell.exe -NoProfile Invoke-Build PesterTests} + } } # Synopsis: Invoke Pester Tests diff --git a/SnipeitPS/SnipeitPS.psd1 b/SnipeitPS/SnipeitPS.psd1 index 9b5b712..f5c1113 100644 --- a/SnipeitPS/SnipeitPS.psd1 +++ b/SnipeitPS/SnipeitPS.psd1 @@ -33,7 +33,7 @@ Copyright = '(c) 2017 Stephen Maunder. All rights reserved.' Description = 'Powershell API for Snipeit Asset Management' # Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '3.0' +PowerShellVersion = '5.1' # Name of the Windows PowerShell host required by this module # PowerShellHostName = '' diff --git a/appveyor.yml b/appveyor.yml index 228ef4f..3d616c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,12 +7,15 @@ # ############################################################ -# This tells AppVeyor that we need WMF 5 and PowerShell 5.0 -os: WMF 5 +# powershell core and 5.1 +image: + - Visual Studio 2017 + - Visual Studio 2019 environment: PSGalleryAPIKey: secure: UdM6qhf5B0G8liHhUrwWERCZr44iSqmg4jUq0lwlTjZs4KyeoiwnBzdej0phqIAm + PShell: '5' version: 1.7.{build} @@ -53,15 +56,41 @@ before_build: build_script: - ps: Invoke-Build -Task Build -# after_build: - # - cmd: mdspell %releasePath%\**/*.md --ignore-numbers --ignore-acronyms --report - test_script: - ps: Invoke-Build -Task Test before_deploy: - ps: Invoke-Build -Task Deploy +#Build with powershell core +for: + - + matrix: + only: + - image: Visual Studio 2019 + environment: + - PShell: '7' + install: + - pwsh: | + Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null + Install-Module InvokeBuild -Scope CurrentUser -Force + Install-Module BuildHelpers -Scope CurrentUser -Force + Install-Module platyPS -Scope CurrentUser -Force + Install-Module Pester -Scope CurrentUser -Force + Install-Module PSScriptAnalyzer -Scope CurrentUser -Force + $env:releasePath = "$($pwd.Path)\Release" + before_build: + - pwsh: Invoke-Build -Task ShowDebug + build_script: + - pwsh: Invoke-Build -Task Build + + test_script: + - pwsh: Invoke-Build -Task Test + + before_deploy: + - pwsh: Invoke-Build -Task Deploy + + deploy: provider: GitHub release: v$(appveyor_build_version) From fad878460a5e7069e28480064bc507457160f707 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:16:12 +0300 Subject: [PATCH 2/7] build with powershell 5 and 7 --- SnipeitPS.build.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SnipeitPS.build.ps1 b/SnipeitPS.build.ps1 index 48a0ac9..12627d7 100644 --- a/SnipeitPS.build.ps1 +++ b/SnipeitPS.build.ps1 @@ -191,7 +191,9 @@ task Deploy -If ( (-not ($env:APPVEYOR_PULL_REQUEST_NUMBER)) -and # Do not deploy if the commit contains the string "skip-deploy" # Meant for major/minor version publishes with a .0 build/patch version (like 2.1.0) - $env:APPVEYOR_REPO_COMMIT_MESSAGE -notlike '*skip-deploy*' + $env:APPVEYOR_REPO_COMMIT_MESSAGE -notlike '*skip-deploy*' -and + # publish from one powershell version is enought + $env:PShell -eq '5' ) { Remove-Module SnipeitPS -ErrorAction SilentlyContinue }, PublishToGallery From cbc80dc633ece64a09e36749e51049134b3f19b5 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:23:48 +0300 Subject: [PATCH 3/7] corrected indentation --- appveyor.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3d616c3..1529ff1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,27 +68,27 @@ for: matrix: only: - image: Visual Studio 2019 - environment: - - PShell: '7' - install: - - pwsh: | - Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null - Install-Module InvokeBuild -Scope CurrentUser -Force - Install-Module BuildHelpers -Scope CurrentUser -Force - Install-Module platyPS -Scope CurrentUser -Force - Install-Module Pester -Scope CurrentUser -Force - Install-Module PSScriptAnalyzer -Scope CurrentUser -Force - $env:releasePath = "$($pwd.Path)\Release" - before_build: - - pwsh: Invoke-Build -Task ShowDebug - build_script: - - pwsh: Invoke-Build -Task Build + environment: + - PShell: '7' + install: + - pwsh: | + Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null + Install-Module InvokeBuild -Scope CurrentUser -Force + Install-Module BuildHelpers -Scope CurrentUser -Force + Install-Module platyPS -Scope CurrentUser -Force + Install-Module Pester -Scope CurrentUser -Force + Install-Module PSScriptAnalyzer -Scope CurrentUser -Force + $env:releasePath = "$($pwd.Path)\Release" + before_build: + - pwsh: Invoke-Build -Task ShowDebug + build_script: + - pwsh: Invoke-Build -Task Build - test_script: - - pwsh: Invoke-Build -Task Test + test_script: + - pwsh: Invoke-Build -Task Test - before_deploy: - - pwsh: Invoke-Build -Task Deploy + before_deploy: + - pwsh: Invoke-Build -Task Deploy deploy: From eb3b334e42370920bea8261bbc5dda248156e3ef Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:25:03 +0300 Subject: [PATCH 4/7] corrected indentation --- appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1529ff1..2f6b8e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,13 +72,13 @@ for: - PShell: '7' install: - pwsh: | - Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null - Install-Module InvokeBuild -Scope CurrentUser -Force - Install-Module BuildHelpers -Scope CurrentUser -Force - Install-Module platyPS -Scope CurrentUser -Force - Install-Module Pester -Scope CurrentUser -Force - Install-Module PSScriptAnalyzer -Scope CurrentUser -Force - $env:releasePath = "$($pwd.Path)\Release" + Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null + Install-Module InvokeBuild -Scope CurrentUser -Force + Install-Module BuildHelpers -Scope CurrentUser -Force + Install-Module platyPS -Scope CurrentUser -Force + Install-Module Pester -Scope CurrentUser -Force + Install-Module PSScriptAnalyzer -Scope CurrentUser -Force + $env:releasePath = "$($pwd.Path)\Release" before_build: - pwsh: Invoke-Build -Task ShowDebug build_script: From da7dd14c4b9f3eed809ef5a2778b8e43e01c80e8 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:27:04 +0300 Subject: [PATCH 5/7] matrix settings --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2f6b8e4..f285fda 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -69,7 +69,7 @@ for: only: - image: Visual Studio 2019 environment: - - PShell: '7' + PShell: '7' install: - pwsh: | Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null From c485fcd23063519996e4e60648771f487483d56c Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:33:02 +0300 Subject: [PATCH 6/7] corrected indentation --- appveyor.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f285fda..74cc040 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -68,27 +68,27 @@ for: matrix: only: - image: Visual Studio 2019 - environment: - PShell: '7' - install: - - pwsh: | - Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null - Install-Module InvokeBuild -Scope CurrentUser -Force - Install-Module BuildHelpers -Scope CurrentUser -Force - Install-Module platyPS -Scope CurrentUser -Force - Install-Module Pester -Scope CurrentUser -Force - Install-Module PSScriptAnalyzer -Scope CurrentUser -Force - $env:releasePath = "$($pwd.Path)\Release" - before_build: - - pwsh: Invoke-Build -Task ShowDebug - build_script: - - pwsh: Invoke-Build -Task Build + environment: + PShell: '7' + install: + - pwsh: | + Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null + Install-Module InvokeBuild -Scope CurrentUser -Force + Install-Module BuildHelpers -Scope CurrentUser -Force + Install-Module platyPS -Scope CurrentUser -Force + Install-Module Pester -Scope CurrentUser -Force + Install-Module PSScriptAnalyzer -Scope CurrentUser -Force + $env:releasePath = "$($pwd.Path)\Release" + before_build: + - pwsh: Invoke-Build -Task ShowDebug + build_script: + - pwsh: Invoke-Build -Task Build - test_script: - - pwsh: Invoke-Build -Task Test + test_script: + - pwsh: Invoke-Build -Task Test - before_deploy: - - pwsh: Invoke-Build -Task Deploy + before_deploy: + - pwsh: Invoke-Build -Task Deploy deploy: From aaeab1cb272e81753fccd5dc2c04bd8c0f5f29c9 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Tue, 15 Jun 2021 14:36:03 +0300 Subject: [PATCH 7/7] pwsh already have nuget --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 74cc040..0fb5249 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,7 +72,6 @@ for: PShell: '7' install: - pwsh: | - Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null Install-Module InvokeBuild -Scope CurrentUser -Force Install-Module BuildHelpers -Scope CurrentUser -Force Install-Module platyPS -Scope CurrentUser -Force