Skip to content

Commit 96e95d5

Browse files
Merge pull request #64 from ActiveDirectoryManagementFramework/development
1.5.81
2 parents 92f4bc6 + 27fbd0c commit 96e95d5

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

ForestManagement/ForestManagement.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
RootModule = 'ForestManagement.psm1'
44

55
# Version number of this module.
6-
ModuleVersion = '1.5.79'
6+
ModuleVersion = '1.5.81'
77

88
# ID used to uniquely identify this module
99
GUID = '7de4379d-17c8-48d3-bd6d-93279aef64bb'

ForestManagement/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.5.81 (2025-10-02)
4+
5+
- Upd: Schema - added parameter to report unmanaged attributes (which will lead to no action during invoke)
6+
- Fix: ExchangeSchema - fails to report failure to update because of a pending reboot
7+
38
## 1.5.79 (2025-05-28)
49

510
- Upd: Schema - Test results are returned in the order they should be applied, to simplify use with Invoke-AdmfItem

ForestManagement/functions/exchangeschema/Invoke-FMExchangeSchema.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191

192192
# Test Message validation (Text parsing is bad, but the method below is less reliable)
193193
if ($result.Message -match 'The Exchange Server setup operation completed successfully') { return }
194+
if ($result.Message -match 'A reboot from a previous installation is pending') { throw "Error applying exchange update: A reboot is pending!"}
194195

195196
# Exchange's setup.exe is not always reliable in its exit codes, thus we need to retest
196197
# This is not guaranteed to work 100%, as replication delay may lead to false errors

ForestManagement/functions/schema/Test-FMSchema.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
.PARAMETER Credential
1515
The credentials to use for this operation.
1616
17+
.PARAMETER ReportUnconfigured
18+
Whether to generate test results for unconfigured schema attributes.
19+
1720
.PARAMETER EnableException
1821
This parameters disables user-friendly warnings and enables the throwing of exceptions.
1922
This is less user friendly, but allows catching exceptions in calling scripts.
@@ -31,6 +34,9 @@
3134
[PSCredential]
3235
$Credential,
3336

37+
[switch]
38+
$ReportUnconfigured = (Get-PSFConfigValue -FullName 'ForestManagement.Schema.Attributes.ReportUnconfigured'),
39+
3440
[switch]
3541
$EnableException
3642
)
@@ -207,7 +213,7 @@
207213
#endregion Process Configuration
208214

209215
#region Process AD Only
210-
if (-not (Get-PSFConfigValue -FullName 'ForestManagement.Schema.Attributes.ReportUnconfigured')) { return }
216+
if (-not $ReportUnconfigured) { return }
211217
$unconfigured = $allAttributes | Where-Object attributeID -NotIn (Get-FMSchema).OID
212218
foreach ($unexpectedAttribute in $unconfigured) {
213219
if ($unexpectedAttribute.IsDefunct) { continue }

0 commit comments

Comments
 (0)