Release v0.3.3: Merge branch 'master' into release

theohbrothers · Jun 29, 2020 · 4c5f9c6 · 4c5f9c6
2 parents 7d8782e + 11d5ac3
commit 4c5f9c6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 28 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,12 +17,12 @@ resources:
     type: github
     name: theohbrothers/PSModulePublisher
     endpoint: theohbrothers                   # Check for your 'Type: Github' connection under 'Project Settings' > 'Service connections'
-    ref: refs/tags/v0.3.2
+    ref: refs/tags/v0.3.4
   - repository: PSRepositoryReleaseManager
     type: github
     name: theohbrothers/PSRepositoryReleaseManager
     endpoint: theohbrothers
-    ref: refs/tags/v0.5.2
+    ref: refs/tags/v0.6.1
 
 stages:
 - stage: build_test
@@ -44,22 +44,6 @@ stages:
     - checkout: self
       submodules: recursive
     - template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
-  - job: windows_powershell_5_0
-    displayName: '[Windows] PowerShell 5.0'
-    pool:
-      vmImage: vs2015-win2012r2
-    steps:
-    - checkout: self
-      submodules: recursive
-    - template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
-  - job: windows_1803
-    displayName: '[Windows Server Core 1803] Windows PowerShell'
-    pool:
-      vmImage: win1803
-    steps:
-    - checkout: self
-      submodules: recursive
-    - template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
   - job: windows_2016
     displayName: '[Windows Server 2016] Windows PowerShell'
     pool:

diff --git a/build/PSModulePublisher b/build/PSModulePublisher
diff --git a/build/PSRepositoryReleaseManager b/build/PSRepositoryReleaseManager
diff --git a/src/ScheduledTaskManagement/Private/Apply-ScheduledTask.ps1 b/src/ScheduledTaskManagement/Private/Apply-ScheduledTask.ps1
@@ -12,13 +12,13 @@ function Apply-ScheduledTask {
                 TaskName = $DefinitionObject['TaskName']
                 TaskPath = $DefinitionObject['TaskPath']
                 Trigger = @(
-                    $DefinitionObject['Trigger'].GetEnumerator() | % {
+                    $DefinitionObject['Trigger'] | % {
                         $args = $_
                         New-ScheduledTaskTrigger @args
                     }
                 )
                 Action = @(
-                    $DefinitionObject['Action'].GetEnumerator() | % {
+                    $DefinitionObject['Action'] | % {
                         $args = $_
                         New-ScheduledTaskAction @args
                     }

diff --git a/src/ScheduledTaskManagement/Public/Setup-ScheduledTask.ps1 b/src/ScheduledTaskManagement/Public/Setup-ScheduledTask.ps1
@@ -5,16 +5,16 @@ function Setup-ScheduledTask {
         [ValidateScript({Test-Path $_ -PathType Leaf})]
         [ValidateNotNullOrEmpty()]
         [string[]]$DefinitionFile
-    ,
+        ,
         [Parameter(ParameterSetName='DefinitionDirectory', Mandatory=$true)]
         [ValidateScript({Test-Path $_ -PathType Container})]
         [ValidateNotNullOrEmpty()]
         [string[]]$DefinitionDirectory
-    ,
+        ,
         [Parameter(ParameterSetName='DefinitionObject', Mandatory=$true)]
         [ValidateNotNullOrEmpty()]
         [object[]]$DefinitionObject
-    ,
+        ,
         [Parameter(ParameterSetName='DefinitionFile', Mandatory=$false)]
         [Parameter(ParameterSetName='DefinitionDirectory', Mandatory=$false)]
         [switch]$AsJson

diff --git a/test/scripts/dep/Install-TestDependencies.ps1 b/test/scripts/dep/Install-TestDependencies.ps1
@@ -9,12 +9,13 @@ try {
     # Install Pester if needed
     "Checking Pester version" | Write-Host
     $pesterMinimumVersion = [version]'4.0.0'
+    $pesterMaximumVersion = [version]'4.10.1'
     $pester = Get-Module 'Pester' -ListAvailable -ErrorAction SilentlyContinue
-    if (!$pester -or !($pester.Version -gt $pesterMinimumVersion)) {
+    if (!$pester -or !($pester.Version -ge $pesterMinimumVersion) -or !($pester.Version -le $pesterMaximumVersion)) {
         "Installing Pester" | Write-Host
-        Install-Module -Name 'Pester' -Repository 'PSGallery' -MinimumVersion $pesterMinimumVersion -Scope CurrentUser -Force
+        Install-Module -Name 'Pester' -Repository 'PSGallery' -MinimumVersion $pesterMinimumVersion -MaximumVersion $pesterMaximumVersion -Scope CurrentUser -Force
     }
-    Get-Module Pester -ListAvailable
+    Get-Module Pester -ListAvailable | Out-String | Write-Verbose
 
 }catch {
     throw
+5 −5		README.md
+1 −1		docs/samples/ci/azure-pipelines/azure-pipelines.yml.linux.container.sample
+1 −1		docs/samples/ci/azure-pipelines/azure-pipelines.yml.linux.sample
+2 −2		docs/samples/ci/azure-pipelines/azure-pipelines.yml.linux.windows.sample
+0 −33		docs/samples/ci/azure-pipelines/azure-pipelines.yml.windows.powershell.5.0.sample
+5 −1		src/Invoke-PSModulePublisher.ps1
+1 −1		src/Invoke-Publish.ps1
+2 −2		src/Invoke-Test.ps1
+2 −2		src/module/Generate-ModuleManifest.ps1
+9 −9		src/module/Publish-Module.ps1
+2 −2		src/module/Test-Module.ps1
+1 −1		src/module/Test-ModuleManifest.ps1
+1 −1		templates/azure-pipelines/entrypoint/windows/powershell/publish.yml
+1 −1		templates/azure-pipelines/steps/powershell/get-powershell-version.yml
+1 −1		templates/azure-pipelines/steps/pwsh/get-powershell-version.yml