Skip to content

Commit fbf3f5f

Browse files
FriedrichWeinmannFriedrichWeinmann
authored
Merge pull request #67 from ActiveDirectoryManagementFramework/development
1.13.110
2 parents 82d21f0 + a3c32f6 commit fbf3f5f

9 files changed

Lines changed: 39259 additions & 1526 deletions

File tree

‎ADMF/ADMF.psd1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RootModule = 'ADMF.psm1'
44

55
# Version number of this module.
6-
ModuleVersion = '1.13.108'
6+
ModuleVersion = '1.13.110'
77

88
# ID used to uniquely identify this module
99
GUID = '43f2a890-942f-4dd7-bad0-b774b44ea849'
@@ -33,8 +33,8 @@
3333
@{ ModuleName = 'Principal'; ModuleVersion = '1.0.0' }
3434
@{ ModuleName = 'ADMF.Core'; ModuleVersion = '1.1.9' }
3535
@{ ModuleName = 'DCManagement'; ModuleVersion = '1.2.25' }
36-
@{ ModuleName = 'DomainManagement'; ModuleVersion = '1.9.218' }
37-
@{ ModuleName = 'ForestManagement'; ModuleVersion = '1.5.79' }
36+
@{ ModuleName = 'DomainManagement'; ModuleVersion = '1.9.228' }
37+
@{ ModuleName = 'ForestManagement'; ModuleVersion = '1.5.81' }
3838
)
3939

4040
# Assemblies that must be loaded prior to importing this module

‎ADMF/bin/ADMF.dll‎

0 Bytes
Binary file not shown.

‎ADMF/bin/ADMF.pdb‎

188 Bytes
Binary file not shown.

‎ADMF/changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 1.13.110 (2025-10-02)
4+
5+
- Upd: Invoke-AdmfForest - reordered sequence to prioritize formal schema updates over custom extensions.
6+
- Upd: Test-AdmfForest - added "SchemaManage" option, to trigger additional test results for schema attributes that exist in schema but have no configuration.
7+
38
## 1.13.108 (2025-05-28)
49

510
- New: DefaultGroupMemberships - Added default groupmemberships as a Component

‎ADMF/functions/Invoke-AdmfForest.ps1‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,31 @@
108108
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'Server Site Assignment', $parameters.Server
109109
Invoke-FMServer @parameters
110110
}
111-
if ($newOptions -band [UpdateForestOptions]::Schema) {
111+
if ($newOptions -band [UpdateForestOptions]::ForestLevel) {
112+
if (Get-FMForestLevel) {
113+
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'ForestLevel', $parameters.Server
114+
Invoke-FMForestLevel @parameters
115+
}
116+
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'ForestLevel' }
117+
}
118+
if ($newOptions -band [UpdateForestOptions]::SchemaLdif) {
119+
if (Get-FMSchemaLdif) {
120+
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'Schema (Ldif)', $parameters.Server
121+
Invoke-FMSchemaLdif @parameters
122+
}
123+
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'Schema (Ldif)' }
124+
}
125+
if ($newOptions -band [UpdateForestOptions]::ExchangeSchema) {
126+
if (Get-FMExchangeSchema) {
127+
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'ExchangeSchema', $parameters.Server
128+
Invoke-FMExchangeSchema @parameters
129+
}
130+
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'ExchangeSchema' }
131+
}
132+
if (
133+
($newOptions -band [UpdateForestOptions]::Schema) -or
134+
($newOptions -band [UpdateForestOptions]::SchemaManage)
135+
) {
112136
if (Get-FMSchema) {
113137
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'Schema (Custom)', $parameters.Server
114138
Invoke-FMSchema @parameters
@@ -122,13 +146,6 @@
122146
}
123147
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'Schema Default Permissions' }
124148
}
125-
if ($newOptions -band [UpdateForestOptions]::SchemaLdif) {
126-
if (Get-FMSchemaLdif) {
127-
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'Schema (Ldif)', $parameters.Server
128-
Invoke-FMSchemaLdif @parameters
129-
}
130-
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'Schema (Ldif)' }
131-
}
132149
if ($newOptions -band [UpdateForestOptions]::NTAuthStore) {
133150
if (Get-FMNTAuthStore) {
134151
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'NTAuthStore', $parameters.Server
@@ -143,20 +160,6 @@
143160
}
144161
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'Certificate' }
145162
}
146-
if ($newOptions -band [UpdateForestOptions]::ForestLevel) {
147-
if (Get-FMForestLevel) {
148-
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'ForestLevel', $parameters.Server
149-
Invoke-FMForestLevel @parameters
150-
}
151-
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'ForestLevel' }
152-
}
153-
if ($newOptions -band [UpdateForestOptions]::ExchangeSchema) {
154-
if (Get-FMExchangeSchema) {
155-
Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Executing.Invoke' -StringValues 'ExchangeSchema', $parameters.Server
156-
Invoke-FMExchangeSchema @parameters
157-
}
158-
else { Write-PSFMessage -Level Host -String 'Invoke-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'ExchangeSchema' }
159-
}
160163
}
161164
catch {
162165
Write-Error $_

‎ADMF/functions/Test-AdmfForest.ps1‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,15 @@
9292
Write-PSFMessage -Level Host -String 'Test-AdmfForest.Executing.Test' -StringValues 'Server Site Assignment', $parameters.Server
9393
Test-FMServer @parameters
9494
}
95-
if ($newOptions -band [UpdateForestOptions]::Schema) {
95+
if (
96+
($newOptions -band [UpdateForestOptions]::Schema) -or
97+
($newOptions -band [UpdateForestOptions]::SchemaManage)
98+
) {
9699
if (Get-FMSchema) {
100+
$manageParam = @{}
101+
if ($newOptions -band [UpdateForestOptions]::SchemaManage) { $manageParam.ReportUnconfigured = $true }
97102
Write-PSFMessage -Level Host -String 'Test-AdmfForest.Executing.Test' -StringValues 'Schema (Custom)', $parameters.Server
98-
Test-FMSchema @parameters
103+
Test-FMSchema @parameters @manageParam
99104
}
100105
else { Write-PSFMessage -Level Host -String 'Test-AdmfForest.Skipping.Test.NoConfiguration' -StringValues 'Schema (Custom)' }
101106
}

0 commit comments

Comments
 (0)