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

ActiveDirectoryDsc: Fix CI Pipeline and DscResource.Common Module Import #614

Merged
merged 4 commits into from
Jun 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
- Changed CI pipeline to use PublishPipelineArtifact & DownloadPipelineArtifact.
- Removed redundant common functions `Resolve-DomainFQDN` and `Set-DscADComputer`.
- Added ActiveDirectoryDsc.Common Module markdown help.
- Updated the `DscResource.Common` module to `v0.9.0`.

- ADDomainTrust
- Move `Get-ActiveDirectoryDomain` and `Get-ActiveDirectoryForest` functions
Expand All @@ -25,6 +26,11 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)

### Fixed

- ActiveDirectoryDsc
- Fixed the CI pipeline by pinning the `Pester` module to `v4.10.1`
- Restored importing the `DscResource.Common` module import in the `ActiveDirectoryDsc.Common` module that was
incorrectly disabled.
([issue #612](https://github.com/dsccommunity/ActiveDirectoryDsc/issues/612)).
- ADReplicationSiteLink
- Fixed setting options after the resource is initially created
([issue #605](https://github.com/dsccommunity/ActiveDirectoryDsc/issues/605)).
Expand Down
4 changes: 2 additions & 2 deletions RequiredModules.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

invokeBuild = 'latest'
PSScriptAnalyzer = 'latest'
pester = 'latest'
pester = '4.10.1'
Plaster = 'latest'
ModuleBuilder = '1.0.0'
ChangelogManagement = 'latest'
Sampler = 'latest'
'DscResource.Common' = '0.5.0'
'DscResource.Common' = '0.9.0'
'DscResource.Test' = 'latest'
'DscResource.AnalyzerRules' = 'latest'
xDscResourceDesigner = 'latest'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ $resourceModulePath = Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent)
$modulesFolderPath = Join-Path -Path $resourceModulePath -ChildPath 'Modules'

$dscResourceCommonModulePath = Join-Path -Path $modulesFolderPath -ChildPath 'DscResource.Common'
#Import-Module -Name $dscResourceCommonModulePath
Import-Module -Name $dscResourceCommonModulePath

$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'

Expand Down