diff --git a/DscResources/GroupSet/GroupSet.psd1 b/DscResources/GroupSet/GroupSet.psd1 index 7247515..1d19475 100644 --- a/DscResources/GroupSet/GroupSet.psd1 +++ b/DscResources/GroupSet/GroupSet.psd1 @@ -22,6 +22,6 @@ Copyright = '(c) 2016 Microsoft. All rights reserved.' Description = 'Configures multiple Group resources with common settings but different names.' # Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '4.0' +PowerShellVersion = '5.1' } diff --git a/DscResources/ProcessSet/ProcessSet.psd1 b/DscResources/ProcessSet/ProcessSet.psd1 index fa6e2c0..4075e4c 100644 --- a/DscResources/ProcessSet/ProcessSet.psd1 +++ b/DscResources/ProcessSet/ProcessSet.psd1 @@ -22,6 +22,6 @@ Copyright = '(c) 2016 Microsoft. All rights reserved.' Description = 'Provides a mechanism to configure and manage multiple WindowsProcess resources on a target node.' # Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '4.0' +PowerShellVersion = '5.1' } diff --git a/DscResources/ServiceSet/ServiceSet.psd1 b/DscResources/ServiceSet/ServiceSet.psd1 index 7b9e705..68f4796 100644 --- a/DscResources/ServiceSet/ServiceSet.psd1 +++ b/DscResources/ServiceSet/ServiceSet.psd1 @@ -22,6 +22,6 @@ Copyright = '(c) 2016 Microsoft. All rights reserved.' Description = 'Allows starting, stopping and change in state or account type for a group of services.' # Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '4.0' +PowerShellVersion = '5.1' } diff --git a/DscResources/WindowsFeatureSet/WindowsFeatureSet.psd1 b/DscResources/WindowsFeatureSet/WindowsFeatureSet.psd1 index 120a5a5..a0a3694 100644 --- a/DscResources/WindowsFeatureSet/WindowsFeatureSet.psd1 +++ b/DscResources/WindowsFeatureSet/WindowsFeatureSet.psd1 @@ -22,6 +22,6 @@ Copyright = '(c) 2016 Microsoft. All rights reserved.' Description = 'Provides a mechanism to configure and manage multiple WindowsFeature resources on a target node.' # Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '4.0' +PowerShellVersion = '5.1' } diff --git a/DscResources/WindowsOptionalFeatureSet/WindowsOptionalFeatureSet.psd1 b/DscResources/WindowsOptionalFeatureSet/WindowsOptionalFeatureSet.psd1 index 16da15a..f9d27d2 100644 --- a/DscResources/WindowsOptionalFeatureSet/WindowsOptionalFeatureSet.psd1 +++ b/DscResources/WindowsOptionalFeatureSet/WindowsOptionalFeatureSet.psd1 @@ -22,6 +22,6 @@ Copyright = '(c) 2016 Microsoft. All rights reserved.' Description = 'Provides a mechanism to configure and manage multiple WindowsOptionalFeature resources on a target node.' # Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '4.0' +PowerShellVersion = '5.1' } diff --git a/PSDscResources.psd1 b/PSDscResources.psd1 index 5e10fbe..5f356ca 100644 --- a/PSDscResources.psd1 +++ b/PSDscResources.psd1 @@ -73,7 +73,7 @@ VariablesToExport = '*' AliasesToExport = @() # DSC resources to export from this module -DscResourcesToExport = 'Group', 'Script', 'Service', 'ServiceSet', 'User', 'WindowsFeature', 'WindowsFeatureSet', 'WindowsOptionalFeature', 'WindowsOptionalFeature', 'WindowsPackageCab', 'WindowsProcess', 'ProcessSet' +DscResourcesToExport = 'Group', 'GroupSet', 'Script', 'Service', 'ServiceSet', 'User', 'WindowsFeature', 'WindowsFeatureSet', 'WindowsOptionalFeature', 'WindowsOptionalFeature', 'WindowsPackageCab', 'WindowsProcess', 'ProcessSet' # List of all modules packaged with this module # ModuleList = @() diff --git a/README.md b/README.md index 5910524..9408b97 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Please check out the common DSC Resources [contributing guidelines](https://gith * [Group](#group): Provides a mechanism to manage local groups on a target node. * [GroupSet](#groupset): Provides a mechanism to configure and manage multiple Group resources with common settings but different names. * [Script](#script): Provides a mechanism to run PowerShell script blocks on a target node. -* [Service](#service): Provides a mechanism to configure and manage Service resources on a target node. +* [Service](#service): Provides a mechanism to configure and manage Windows services on a target node. * [ServiceSet](#serviceset): Provides a mechanism to configure and manage multiple Service resources with common settings but different names. * [User](#user): Provides a mechanism to manage local users on a target node. * [WindowsFeature](#windowsfeature): Provides a mechanism to install or uninstall Windows roles or features on a target node. diff --git a/Tests/TestHelpers/MSFT_WindowsProcess.TestHelper.psm1 b/Tests/TestHelpers/MSFT_WindowsProcess.TestHelper.psm1 deleted file mode 100644 index 0fe4b33..0000000 --- a/Tests/TestHelpers/MSFT_WindowsProcess.TestHelper.psm1 +++ /dev/null @@ -1,26 +0,0 @@ -$errorActionPreference = 'Stop' -Set-StrictMode -Version 'Latest' - -<# - .SYNOPSIS - Stops all instances of the process with the given name. - - .PARAMETER ProcessName - The name of the process to stop. -#> -function Stop-ProcessByName -{ - [CmdletBinding()] - param - ( - [Parameter(Mandatory = $true)] - [String] - $ProcessName - ) - - Stop-Process -Name $ProcessName -ErrorAction 'SilentlyContinue' -Force - Wait-ScriptBlockReturnTrue -ScriptBlock { return $null -eq (Get-Process -Name $ProcessName -ErrorAction 'SilentlyContinue') } ` - -TimeoutSeconds 15 -} - -Export-ModuleMember -Function Stop-ProcessByName