diff --git a/CHANGELOG.md b/CHANGELOG.md index 767c76f48..809a7092e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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)). diff --git a/RequiredModules.psd1 b/RequiredModules.psd1 index 6055c40d3..c2666647c 100644 --- a/RequiredModules.psd1 +++ b/RequiredModules.psd1 @@ -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' diff --git a/source/Modules/ActiveDirectoryDsc.Common/ActiveDirectoryDsc.Common.psm1 b/source/Modules/ActiveDirectoryDsc.Common/ActiveDirectoryDsc.Common.psm1 index dcbcebd76..52e994ff7 100644 --- a/source/Modules/ActiveDirectoryDsc.Common/ActiveDirectoryDsc.Common.psm1 +++ b/source/Modules/ActiveDirectoryDsc.Common/ActiveDirectoryDsc.Common.psm1 @@ -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'