Merge branch 'dsccommunity:main' into main

dsccommunity · Apr 4, 2023 · a7fe698 · a7fe698
2 parents 295a143 + 324afe6
commit a7fe698
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
@@ -19,7 +19,7 @@
     'Sampler.GitHubTasks'        = '0.3.5-preview0002'
     'Sampler.AzureDevOpsTasks'   = '0.1.2'
     PowerShellForGitHub          = '0.16.1'
-    'Sampler.DscPipeline'        = '0.2.0-preview0012'
+    'Sampler.DscPipeline'        = '0.2.0-preview0015'
     MarkdownLinkCheck            = '0.2.0'
     'DscResource.AnalyzerRules'  = '0.2.0'
     DscBuildHelpers              = '0.2.1'

diff --git a/build.yaml b/build.yaml
@@ -1,5 +1,6 @@
 ---
-BuiltModuleSubDirectory: AvoidPSPathOverlap
+BuiltModuleSubDirectory: Module
+
 ####################################################
 #       Sampler Pipeline Configuration             #
 ####################################################
@@ -19,9 +20,11 @@ BuildWorkflow:
   build:
     - Init
     - Clean
+    - Build_Module_ModuleBuilder
     - LoadDatumConfigData
     - TestConfigData
     - CompileDatumRsop
+    - Set_PSModulePath
     - TestDscResources
     - CompileRootConfiguration
     - CompileRootMetaMof
@@ -106,3 +109,10 @@ Sampler.DscPipeline:
   - DscConfig.Demo
   #- Name: CommonTasks
   #  Version: 0.3.259
+
+####################################################
+#           Setting Sampler PSModulePath           #
+####################################################
+SetPSModulePath:
+  RemovePersonal: true
+  RemoveProgramFiles: true
diff --git a/source/DscWorkshop.psm1 b/source/DscWorkshop.psm1
@@ -0,0 +1,2 @@
+<#
+#>