Skip to content

Commit c00959e

Browse files
FriedrichWeinmannFriedrichWeinmann
authored
Merge pull request #58 from ActiveDirectoryManagementFramework/development
1.5.76
2 parents 95a4233 + cac33c9 commit c00959e

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
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.75'
6+
ModuleVersion = '1.5.76'
77

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

‎ForestManagement/changelog.md‎

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

3+
## 1.5.76 (2024-03-05)
4+
5+
- Fix: Exchange Schema - invoke fails on validating sites.
6+
37
## 1.5.75 (2024-02-12)
48

59
- Fix: Schema - fails to add new attributes to classes.

‎ForestManagement/functions/exchangeschema/Invoke-FMExchangeSchema.ps1‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@
224224
if (-not (Test-ExchangeIsoPath -Session $session -Path $testItem.Configuration.LocalImagePath)) {
225225
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.IsoPath.Missing' -StringValues $testItem.Configuration.LocalImagePath -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
226226
}
227-
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forest)) {
228-
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forest.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
227+
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forestObject)) {
228+
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forestObject.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
229229
}
230230
Invoke-PSFProtectedCommand -ActionString 'Invoke-FMExchangeSchema.Installing' -ActionStringValues $testItem.Configuration -Target $forestObject -ScriptBlock {
231231
Invoke-ExchangeSchemaUpdate @commonParam -Mode InstallSchema -SchemaOnly
@@ -238,8 +238,8 @@
238238
if (-not (Test-ExchangeIsoPath -Session $session -Path $testItem.Configuration.LocalImagePath)) {
239239
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.IsoPath.Missing' -StringValues $testItem.Configuration.LocalImagePath -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
240240
}
241-
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forest)) {
242-
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forest.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
241+
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forestObject)) {
242+
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forestObject.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
243243
}
244244
Invoke-PSFProtectedCommand -ActionString 'Invoke-FMExchangeSchema.Updating' -ActionStringValues $testItem.ADObject, $testItem.Configuration -Target $forestObject -ScriptBlock {
245245
Invoke-ExchangeSchemaUpdate @commonParam -Mode UpdateSchema -SchemaOnly
@@ -252,8 +252,8 @@
252252
if (-not (Test-ExchangeIsoPath -Session $session -Path $testItem.Configuration.LocalImagePath)) {
253253
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.IsoPath.Missing' -StringValues $testItem.Configuration.LocalImagePath -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
254254
}
255-
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forest)) {
256-
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forest.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
255+
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forestObject)) {
256+
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forestObject.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
257257
}
258258
Invoke-PSFProtectedCommand -ActionString 'Invoke-FMExchangeSchema.Installing' -ActionStringValues $testItem.Configuration -Target $forestObject -ScriptBlock {
259259
Invoke-ExchangeSchemaUpdate @commonParam -Mode Install
@@ -266,8 +266,8 @@
266266
if (-not (Test-ExchangeIsoPath -Session $session -Path $testItem.Configuration.LocalImagePath)) {
267267
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.IsoPath.Missing' -StringValues $testItem.Configuration.LocalImagePath -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
268268
}
269-
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forest)) {
270-
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forest.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
269+
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forestObject)) {
270+
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forestObject.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
271271
}
272272
Invoke-PSFProtectedCommand -ActionString 'Invoke-FMExchangeSchema.Updating' -ActionStringValues $testItem.ADObject, $testItem.Configuration -Target $forestObject -ScriptBlock {
273273
Invoke-ExchangeSchemaUpdate @commonParam -Mode Update
@@ -279,8 +279,8 @@
279279
if (-not (Test-ExchangeIsoPath -Session $session -Path $testItem.Configuration.LocalImagePath)) {
280280
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.IsoPath.Missing' -StringValues $testItem.Configuration.LocalImagePath -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
281281
}
282-
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forest)) {
283-
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forest.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
282+
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forestObject)) {
283+
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forestObject.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
284284
}
285285
Invoke-PSFProtectedCommand -ActionString 'Invoke-FMExchangeSchema.DisablingSplitPermissions' -ActionStringValues $testItem.Configuration -Target $Server -ScriptBlock {
286286
Invoke-ExchangeSchemaUpdate @commonParam -Mode DisableSplitP -AllDomains $testItem.Configuration.AllDomains
@@ -290,8 +290,8 @@
290290
if (-not (Test-ExchangeIsoPath -Session $session -Path $testItem.Configuration.LocalImagePath)) {
291291
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.IsoPath.Missing' -StringValues $testItem.Configuration.LocalImagePath -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
292292
}
293-
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forest)) {
294-
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forest.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
293+
if (-not (Test-ExchangeSite -Parameters $parameters -Forest $forestObject)) {
294+
Stop-PSFFunction -String 'Invoke-FMExchangeSchema.SchemaMaster.WrongSite' -StringValues $parameters.Server, $forestObject.SchemaMaster -EnableException $EnableException -Continue -Category ResourceUnavailable -Target $Server
295295
}
296296
Invoke-PSFProtectedCommand -ActionString 'Invoke-FMExchangeSchema.EnablingSplitPermissions' -ActionStringValues $testItem.Configuration -Target $Server -ScriptBlock {
297297
Invoke-ExchangeSchemaUpdate @commonParam -Mode EnableSplitP -AllDomains $testItem.Configuration.AllDomains

0 commit comments

Comments
 (0)