Skip to content

Commit 4c5f9c6

Browse files
committed
Release v0.3.3: Merge branch 'master' into release
2 parents 7d8782e + 11d5ac3 commit 4c5f9c6

6 files changed

Lines changed: 13 additions & 28 deletions

File tree

azure-pipelines.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ resources:
1717
type: github
1818
name: theohbrothers/PSModulePublisher
1919
endpoint: theohbrothers # Check for your 'Type: Github' connection under 'Project Settings' > 'Service connections'
20-
ref: refs/tags/v0.3.2
20+
ref: refs/tags/v0.3.4
2121
- repository: PSRepositoryReleaseManager
2222
type: github
2323
name: theohbrothers/PSRepositoryReleaseManager
2424
endpoint: theohbrothers
25-
ref: refs/tags/v0.5.2
25+
ref: refs/tags/v0.6.1
2626

2727
stages:
2828
- stage: build_test
@@ -44,22 +44,6 @@ stages:
4444
- checkout: self
4545
submodules: recursive
4646
- template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
47-
- job: windows_powershell_5_0
48-
displayName: '[Windows] PowerShell 5.0'
49-
pool:
50-
vmImage: vs2015-win2012r2
51-
steps:
52-
- checkout: self
53-
submodules: recursive
54-
- template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
55-
- job: windows_1803
56-
displayName: '[Windows Server Core 1803] Windows PowerShell'
57-
pool:
58-
vmImage: win1803
59-
steps:
60-
- checkout: self
61-
submodules: recursive
62-
- template: templates/azure-pipelines/entrypoint/windows/powershell/continuous-build.yml@PSModulePublisher
6347
- job: windows_2016
6448
displayName: '[Windows Server 2016] Windows PowerShell'
6549
pool:

src/ScheduledTaskManagement/Private/Apply-ScheduledTask.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ function Apply-ScheduledTask {
1212
TaskName = $DefinitionObject['TaskName']
1313
TaskPath = $DefinitionObject['TaskPath']
1414
Trigger = @(
15-
$DefinitionObject['Trigger'].GetEnumerator() | % {
15+
$DefinitionObject['Trigger'] | % {
1616
$args = $_
1717
New-ScheduledTaskTrigger @args
1818
}
1919
)
2020
Action = @(
21-
$DefinitionObject['Action'].GetEnumerator() | % {
21+
$DefinitionObject['Action'] | % {
2222
$args = $_
2323
New-ScheduledTaskAction @args
2424
}

src/ScheduledTaskManagement/Public/Setup-ScheduledTask.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ function Setup-ScheduledTask {
55
[ValidateScript({Test-Path $_ -PathType Leaf})]
66
[ValidateNotNullOrEmpty()]
77
[string[]]$DefinitionFile
8-
,
8+
,
99
[Parameter(ParameterSetName='DefinitionDirectory', Mandatory=$true)]
1010
[ValidateScript({Test-Path $_ -PathType Container})]
1111
[ValidateNotNullOrEmpty()]
1212
[string[]]$DefinitionDirectory
13-
,
13+
,
1414
[Parameter(ParameterSetName='DefinitionObject', Mandatory=$true)]
1515
[ValidateNotNullOrEmpty()]
1616
[object[]]$DefinitionObject
17-
,
17+
,
1818
[Parameter(ParameterSetName='DefinitionFile', Mandatory=$false)]
1919
[Parameter(ParameterSetName='DefinitionDirectory', Mandatory=$false)]
2020
[switch]$AsJson

test/scripts/dep/Install-TestDependencies.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ try {
99
# Install Pester if needed
1010
"Checking Pester version" | Write-Host
1111
$pesterMinimumVersion = [version]'4.0.0'
12+
$pesterMaximumVersion = [version]'4.10.1'
1213
$pester = Get-Module 'Pester' -ListAvailable -ErrorAction SilentlyContinue
13-
if (!$pester -or !($pester.Version -gt $pesterMinimumVersion)) {
14+
if (!$pester -or !($pester.Version -ge $pesterMinimumVersion) -or !($pester.Version -le $pesterMaximumVersion)) {
1415
"Installing Pester" | Write-Host
15-
Install-Module -Name 'Pester' -Repository 'PSGallery' -MinimumVersion $pesterMinimumVersion -Scope CurrentUser -Force
16+
Install-Module -Name 'Pester' -Repository 'PSGallery' -MinimumVersion $pesterMinimumVersion -MaximumVersion $pesterMaximumVersion -Scope CurrentUser -Force
1617
}
17-
Get-Module Pester -ListAvailable
18+
Get-Module Pester -ListAvailable | Out-String | Write-Verbose
1819

1920
}catch {
2021
throw

0 commit comments

Comments
 (0)