Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds xADComputer Resource #96

Merged
merged 18 commits into from
Jun 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DSCResource.Tests/
1 change: 0 additions & 1 deletion DSCResource.Tests
Submodule DSCResource.Tests deleted from b367d4
27 changes: 20 additions & 7 deletions DSCResources/MSFT_xADCommon/MSFT_xADCommon.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
data localizedString
data localizedString
{
# culture="en-US"
ConvertFrom-StringData @'
Expand Down Expand Up @@ -282,8 +282,12 @@ function Test-Members
$MembersToExclude
)

if ($Members.Count -gt 0)
if ($PSBoundParameters.ContainsKey('Members'))
{
if ($null -eq $Members)
{
$Members = @();
}
Write-Verbose ($localizedString.CheckingMembers -f 'Explicit');
$Members = [System.String[]] @(Remove-DuplicateMembers -Members $Members);
if ($ExistingMembers.Count -ne $Members.Count)
Expand All @@ -296,14 +300,18 @@ function Test-Members
{
if ($member -notin $ExistingMembers)
{
Write-Verbose -Message ($Localizeda.MemberNotInDesiredState -f $member);;
Write-Verbose -Message ($localizedString.MemberNotInDesiredState -f $member);
return $false;
}
}
} #end if $Members

if ($MembersToInclude.Count -gt 0)
{
if ($PSBoundParameters.ContainsKey('MembersToInclude'))
{
if ($null -eq $MembersToInclude)
{
$MembersToInclude = @();
}
Write-Verbose -Message ($localizedString.CheckingMembers -f 'Included');
$MembersToInclude = [System.String[]] @(Remove-DuplicateMembers -Members $MembersToInclude);
foreach ($member in $MembersToInclude)
Expand All @@ -316,8 +324,13 @@ function Test-Members
}
} #end if $MembersToInclude

if ($MembersToExclude.Count -gt 0)
#if ($MembersToExclude.Count -gt 0)
if ($PSBoundParameters.ContainsKey('MembersToExclude'))
{
if ($null -eq $MembersToExclude)
{
$MembersToExclude = @();
}
Write-Verbose -Message ($localizedString.CheckingMembers -f 'Excluded');
$MembersToExclude = [System.String[]] @(Remove-DuplicateMembers -Members $MembersToExclude);
foreach ($member in $MembersToExclude)
Expand Down Expand Up @@ -429,7 +442,7 @@ function Get-ADCommonParameters
(
[Parameter(Mandatory)]
[ValidateNotNullOrEmpty()]
[Alias('UserName','GroupName')]
[Alias('UserName','GroupName','ComputerName')]
[System.String]
$Identity,

Expand Down
Loading