Skip to content

Commit 02149c5

Browse files
authored
Reorganize module to prepare for Pester 5 (#65)
* Rename test files * Rename Utils module to Common and separate functions to separate files * Reference new module name * Remove non DSC Community files * Update case on READMEs * Update paths * Remove test run scripts * Use modulefast * Update changelog * Update changelog
1 parent 960f909 commit 02149c5

40 files changed

+449
-651
lines changed

.vscode/RunGlobalTests.ps1

Lines changed: 0 additions & 41 deletions
This file was deleted.

.vscode/RunPesterTests.ps1

Lines changed: 0 additions & 38 deletions
This file was deleted.

.vscode/ScriptAnalyzerSettings.psd1

Lines changed: 0 additions & 7 deletions
This file was deleted.

.vscode/launch.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
55

66
## [Unreleased]
77

8+
### Changed
9+
10+
- SChannelDsc
11+
- Update module to latest DSCCommunity format.
12+
- Rename SChannelDsc.Utils to SChannelDsc.Common.
13+
- Convert SChannelDsc.Common a buildable nested module.
14+
- Update case on resource README files.
15+
816
## [1.5.0] - 2026-01-27
917

1018
### Changed

Resolve-Dependency.psd1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
script and correct parameter values. This will also affect the use of parameter
5858
`-UseModuleFast` of the Resolve-Dependency.ps1 or build.ps1 script.
5959
#>
60-
#UseModuleFast = $true
60+
UseModuleFast = $true
6161
#ModuleFastVersion = '0.1.2'
6262
#ModuleFastBleedingEdge = $true
6363

@@ -73,4 +73,3 @@
7373
UsePowerShellGetCompatibilityModule = $true
7474
UsePowerShellGetCompatibilityModuleVersion = '3.0.23-beta23'
7575
}
76-

build.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
CopyPaths:
77
- en-US
88
- DSCResources
9-
- Modules
109
Encoding: UTF8
1110
VersionedOutputDirectory: true
1211
BuiltModuleSubdirectory: builtModule
@@ -21,6 +20,12 @@ NestedModule:
2120
Path: ./output/RequiredModules/DscResource.Common
2221
AddToManifest: false
2322
Exclude: PSGetModuleInfo.xml
23+
SChannelDsc.Common:
24+
Prefix: prefix.ps1
25+
VersionedOutputDirectory: false
26+
CopyPaths:
27+
- en-US
28+
Encoding: UTF8
2429

2530
####################################################
2631
# Sampler Pipeline Configuration #

source/DSCResources/MSFT_Cipher/MSFT_Cipher.psm1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
$script:resourceModulePath = Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent) -Parent
2-
$script:modulesFolderPath = Join-Path -Path $script:resourceModulePath -ChildPath 'Modules'
3-
$script:resourceHelperModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'SChannelDsc.Util'
4-
Import-Module -Name (Join-Path -Path $script:resourceHelperModulePath -ChildPath 'SChannelDsc.Util.psm1')
1+
$script:sChannelDscHelperModulePath = Join-Path -Path $PSScriptRoot -ChildPath '..\..\Modules\SChannelDsc.Common'
2+
$script:resourceHelperModulePath = Join-Path -Path $PSScriptRoot -ChildPath '..\..\Modules\DscResource.Common'
53

6-
$script:localizedData = SChannelDsc.Util\Get-LocalizedData -ResourceName 'MSFT_Cipher'
4+
Import-Module -Name $script:sChannelDscHelperModulePath
5+
Import-Module -Name $script:resourceHelperModulePath
6+
7+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
78

89
function Get-TargetResource
910
{

source/DSCResources/MSFT_CipherSuites/MSFT_CipherSuites.psm1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
$script:resourceModulePath = Split-Path -Path (Split-Path -Path $PSScriptRoot -Parent) -Parent
2-
$script:modulesFolderPath = Join-Path -Path $script:resourceModulePath -ChildPath 'Modules'
3-
$script:resourceHelperModulePath = Join-Path -Path $script:modulesFolderPath -ChildPath 'SChannelDsc.Util'
4-
Import-Module -Name (Join-Path -Path $script:resourceHelperModulePath -ChildPath 'SChannelDsc.Util.psm1')
1+
$script:sChannelDscHelperModulePath = Join-Path -Path $PSScriptRoot -ChildPath '..\..\Modules\SChannelDsc.Common'
2+
$script:resourceHelperModulePath = Join-Path -Path $PSScriptRoot -ChildPath '..\..\Modules\DscResource.Common'
53

6-
$script:localizedData = SChannelDsc.Util\Get-LocalizedData -ResourceName 'MSFT_CipherSuites'
4+
Import-Module -Name $script:sChannelDscHelperModulePath
5+
Import-Module -Name $script:resourceHelperModulePath
6+
7+
$script:localizedData = Get-LocalizedData -DefaultUICulture 'en-US'
78

89
function Get-TargetResource
910
{

0 commit comments

Comments
 (0)