ComputerManagementDsc: Class-based resources re-use module DscResourc…

…e.Base (#405) * ComputerManagementDsc: Class-based resources re-use module DscResource.Base * Fix CHANGELOG.md * Fix CHANGELOG.md * Merge branch 'main' into f/remove-resourcebase Co-Authored-By: Daniel Scott-Raynsford <[email protected]>
dsccommunity · Feb 25, 2023 · 41ec47e · 41ec47e
1 parent 03395c4
commit 41ec47e
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 852 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     in the module manifest in the source folder as the built module is
     automatically updated with this information by the pipeline - Fixes [Issue #396](https://github.com/dsccommunity/ComputerManagementDsc/issues/396).
   - Moved the build step of the pipeline to a Windows build worker when running in Azure DevOps.
+  - The class-based resources are now re-using the module DscResource.Base - Fixes [Issue #404](https://github.com/dsccommunity/ComputerManagementDsc/issues/404).
+  - Removed the file `source/build.psd1` as it is no longer required for the
+    build pipeline.
 
 ## [8.5.0] - 2021-09-13
 

diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
@@ -20,6 +20,7 @@
     'DscResource.AnalyzerRules' = 'latest'
     'DscResource.DocGenerator'  = 'latest'
     'DscResource.Common'        = 'latest'
+    'DscResource.Base'          = 'latest'
     xDscResourceDesigner        = 'latest'
     LoopbackAdapter             = 'latest'
 }
diff --git a/build.yaml b/build.yaml
@@ -21,6 +21,12 @@ NestedModule:
     AddToManifest: false
     Exclude: PSGetModuleInfo.xml
 
+  DscResource.Base:
+    CopyOnly: true
+    Path: ./output/RequiredModules/DscResource.Base
+    AddToManifest: false
+    Exclude: PSGetModuleInfo.xml
+
 ####################################################
 #       Pipeline Configuration                     #
 ####################################################
@@ -62,6 +68,7 @@ Pester:
   OutputFormat: NUnitXML
   ExcludeFromCodeCoverage:
     - Modules/DscResource.Common
+    - Modules/DscResource.Base
   Script:
     - tests/Unit
   ExcludeTag:
@@ -78,6 +85,7 @@ DscTest:
     - output
   ExcludeModuleFile:
     - Modules/DscResource.Common
+    - Modules/DscResource.Base
   MainGitBranch: main
 
 Resolve-Dependency:

diff --git a/source/Build.psd1 b/source/Build.psd1
diff --git a/source/Classes/010.ResourceBase.ps1 b/source/Classes/010.ResourceBase.ps1
diff --git a/source/Classes/020.PSResourceRepository.ps1 b/source/Classes/020.PSResourceRepository.ps1
@@ -112,7 +112,8 @@ class PSResourceRepository : ResourceBase
     [Nullable[System.Boolean]]
     $Default
 
-    PSResourceRepository () : base ()
+    # Passing the module's base directory to the base constructor so it finds localization files.
+    PSResourceRepository () : base ($PSScriptRoot)
     {
         # These properties will not be enforced.
         $this.ExcludeDscProperties = @(

diff --git a/source/Enum/1.Ensure.ps1 b/source/Enum/1.Ensure.ps1
diff --git a/source/Private/ConvertFrom-CompareResult.ps1 b/source/Private/ConvertFrom-CompareResult.ps1