Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ForestManagement/ForestManagement.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
RootModule = 'ForestManagement.psm1'

# Version number of this module.
ModuleVersion = '1.5.79'
ModuleVersion = '1.5.81'

# ID used to uniquely identify this module
GUID = '7de4379d-17c8-48d3-bd6d-93279aef64bb'
Expand Down
5 changes: 5 additions & 0 deletions ForestManagement/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 1.5.81 (2025-10-02)

- Upd: Schema - added parameter to report unmanaged attributes (which will lead to no action during invoke)
- Fix: ExchangeSchema - fails to report failure to update because of a pending reboot

## 1.5.79 (2025-05-28)

- Upd: Schema - Test results are returned in the order they should be applied, to simplify use with Invoke-AdmfItem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@

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

# Exchange's setup.exe is not always reliable in its exit codes, thus we need to retest
# This is not guaranteed to work 100%, as replication delay may lead to false errors
Expand Down
8 changes: 7 additions & 1 deletion ForestManagement/functions/schema/Test-FMSchema.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
.PARAMETER Credential
The credentials to use for this operation.

.PARAMETER ReportUnconfigured
Whether to generate test results for unconfigured schema attributes.

.PARAMETER EnableException
This parameters disables user-friendly warnings and enables the throwing of exceptions.
This is less user friendly, but allows catching exceptions in calling scripts.
Expand All @@ -31,6 +34,9 @@
[PSCredential]
$Credential,

[switch]
$ReportUnconfigured = (Get-PSFConfigValue -FullName 'ForestManagement.Schema.Attributes.ReportUnconfigured'),

[switch]
$EnableException
)
Expand Down Expand Up @@ -207,7 +213,7 @@
#endregion Process Configuration

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