xActiveDirectory: Combine DscResource.LocalizationHelper and DscResou…

…rce.Common (dsccommunity#270) - Changes to xActiveDirectory - Combined the DscResource.LocalizationHelper and DscResource.Common modules into xActiveDirectory.Common (issue dsccommunity#268).
johlju · May 11, 2019 · 720a543 · 720a543
1 parent 684fd11
commit 720a543
Show file tree

Hide file tree

Showing 12 changed files with 650 additions and 683 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
     and [@kungfu71186](https://github.com/kungfu71186)
   - Removing the Misc Folder, as it is no longer required.
   - Added xADKDSKey resource to create KDS Root Keys for gMSAs. [@kungfu71186](https://github.com/kungfu71186)
+  - Combined DscResource.LocalizationHelper and DscResource.Common Modules into xActiveDirectory.Common
 - Changes to xADReplicationSiteLink
   - Make use of the new localization helper functions.
 - Changes to xAdDomainController

diff --git a/DSCResources/MSFT_xADCommon/MSFT_xADCommon.psm1 b/DSCResources/MSFT_xADCommon/MSFT_xADCommon.psm1
@@ -1,8 +1,8 @@
 $script:resourceModulePath = Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent) -Parent
 $script:modulesFolderPath = Join-Path -Path $script:resourceModulePath -ChildPath 'Modules'
 
-$script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'DscResource.LocalizationHelper'
-Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'DscResource.LocalizationHelper.psm1')
+$script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'xActiveDirectory.Common'
+Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'xActiveDirectory.Common.psm1')
 
 data localizedString
 {

diff --git a/DSCResources/MSFT_xADDomainController/MSFT_xADDomainController.psm1 b/DSCResources/MSFT_xADDomainController/MSFT_xADDomainController.psm1
@@ -1,8 +1,8 @@
 $script:resourceModulePath = Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent) -Parent
 $script:modulesFolderPath = Join-Path -Path $script:resourceModulePath -ChildPath 'Modules'
 
-$script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'DscResource.LocalizationHelper'
-Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'DscResource.LocalizationHelper.psm1')
+$script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'xActiveDirectory.Common'
+Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'xActiveDirectory.Common.psm1')
 
 $script:localizedData = Get-LocalizedData -ResourceName 'MSFT_xADDomainController'
 

diff --git a/DSCResources/MSFT_xADKDSKey/MSFT_xADKDSKey.psm1 b/DSCResources/MSFT_xADKDSKey/MSFT_xADKDSKey.psm1
@@ -5,12 +5,12 @@ $script:resourceModulePath = Split-Path `
 
 $script:localizationModulePath = Join-Path `
 -Path $script:resourceModulePath `
--ChildPath 'Modules\DscResource.LocalizationHelper'
+-ChildPath 'Modules\xActiveDirectory.Common'
 
 Import-Module -Name (
 Join-Path `
     -Path $script:localizationModulePath `
-    -ChildPath 'DscResource.LocalizationHelper.psm1'
+    -ChildPath 'xActiveDirectory.Common.psm1'
 )
 
 $script:localizedData = Get-LocalizedData -ResourceName 'MSFT_xADKDSKey'

diff --git a/DSCResources/MSFT_xADManagedServiceAccount/MSFT_xADManagedServiceAccount.psm1 b/DSCResources/MSFT_xADManagedServiceAccount/MSFT_xADManagedServiceAccount.psm1
@@ -4,12 +4,12 @@ $script:resourceModulePath = Split-Path `
 
 $script:localizationModulePath = Join-Path `
 -Path $script:resourceModulePath `
--ChildPath 'Modules\DscResource.LocalizationHelper'
+-ChildPath 'Modules\xActiveDirectory.Common'
 
 Import-Module -Name (
 Join-Path `
     -Path $script:localizationModulePath `
-    -ChildPath 'DscResource.LocalizationHelper.psm1'
+    -ChildPath 'xActiveDirectory.Common.psm1'
 )
 
 $script:localizedData = Get-LocalizedData -ResourceName 'MSFT_xADManagedServiceAccount'

diff --git a/DSCResources/MSFT_xADReplicationSiteLink/MSFT_xADReplicationSiteLink.psm1 b/DSCResources/MSFT_xADReplicationSiteLink/MSFT_xADReplicationSiteLink.psm1
@@ -1,8 +1,8 @@
 $script:resourceModulePath = Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent) -Parent
 $script:modulesFolderPath = Join-Path -Path $script:resourceModulePath -ChildPath 'Modules'
 
-$script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'DscResource.LocalizationHelper'
-Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'DscResource.LocalizationHelper.psm1')
+$script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'xActiveDirectory.Common'
+Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'xActiveDirectory.Common.psm1')
 
 $script:localizedData = Get-LocalizedData -ResourceName 'MSFT_xADReplicationSiteLink'
 

diff --git a/Modules/DscResource.Common/DscResource.Common.psm1 b/Modules/DscResource.Common/DscResource.Common.psm1