Merge pull request #6398 from FabienTschanz/fix/aadcrosstenant-export

NikCharlebois · web-flow · commit 4e0a403fdc49 · 2025-08-06T17:02:29.000-04:00
Fix export of cross tenant access policy
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 * AADApplication
   * Fixed an issue where not all properties were exported.
+* AADCrossTenantAccessPolicyConfigurationDefault
+  * Fixed an issue where the export returns an invalid value for `Targets`.
+    FIXES [#6397](https://github.com/microsoft/Microsoft365DSC/issues/6397)
 * AADServicePrincipal
   * Fixes for retrieving instance by name.
 * AADUser
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1
@@ -101,11 +101,11 @@ function Get-TargetResource
             $B2BCollaborationInboundValue = @{
                 Applications = @{
                     AccessType = $getValue.B2BCollaborationInbound.Applications.AccessType
-                    Targets    = [System.String[]] $getValue.B2BCollaborationInbound.Applications.Targets
+                    Targets    = [System.Array]$getValue.B2BCollaborationInbound.Applications.Targets
                 }
                 UsersAndGroups =@{
                     AccessType = $getValue.B2BCollaborationInbound.UsersAndGroups.AccessType
-                    Targets    = [System.String[]] $getValue.B2BCollaborationInbound.UsersAndGroups.Targets
+                    Targets    = [System.Array] $getValue.B2BCollaborationInbound.UsersAndGroups.Targets
                 }
             }
         }
@@ -114,11 +114,11 @@ function Get-TargetResource
             $B2BCollaborationOutboundValue = @{
                 Applications = @{
                     AccessType = $getValue.B2BCollaborationOutbound.Applications.AccessType
-                    Targets    = [System.String[]] $getValue.B2BCollaborationOutbound.Applications.Targets
+                    Targets    = [System.Array] $getValue.B2BCollaborationOutbound.Applications.Targets
                 }
                 UsersAndGroups =@{
                     AccessType = $getValue.B2BCollaborationOutbound.UsersAndGroups.AccessType
-                    Targets    = [System.String[]] $getValue.B2BCollaborationOutbound.UsersAndGroups.Targets
+                    Targets    = [System.Array] $getValue.B2BCollaborationOutbound.UsersAndGroups.Targets
                 }
             }
         }
@@ -127,11 +127,11 @@ function Get-TargetResource
             $B2BDirectConnectInboundValue = @{
                 Applications = @{
                     AccessType = $getValue.B2BDirectConnectInbound.Applications.AccessType
-                    Targets    = [System.String[]] $getValue.B2BDirectConnectInbound.Applications.Targets
+                    Targets    = [System.Array] $getValue.B2BDirectConnectInbound.Applications.Targets
                 }
                 UsersAndGroups =@{
                     AccessType = $getValue.B2BDirectConnectInbound.UsersAndGroups.AccessType
-                    Targets    = [System.String[]] $getValue.B2BDirectConnectInbound.UsersAndGroups.Targets
+                    Targets    = [System.Array] $getValue.B2BDirectConnectInbound.UsersAndGroups.Targets
                 }
             }
         }
@@ -140,11 +140,11 @@ function Get-TargetResource
             $B2BDirectConnectOutboundValue = @{
                 Applications = @{
                     AccessType = $getValue.B2BDirectConnectOutbound.Applications.AccessType
-                    Targets    = [System.String[]] $getValue.B2BDirectConnectOutbound.Applications.Targets
+                    Targets    = [System.Array] $getValue.B2BDirectConnectOutbound.Applications.Targets
                 }
                 UsersAndGroups =@{
                     AccessType = $getValue.B2BDirectConnectOutbound.UsersAndGroups.AccessType
-                    Targets    = [System.String[]] $getValue.B2BDirectConnectOutbound.UsersAndGroups.Targets
+                    Targets    = [System.Array] $getValue.B2BDirectConnectOutbound.UsersAndGroups.Targets
                 }
             }
         }
@@ -837,4 +837,3 @@ function Get-M365DSCAADCrossTenantAccessPolicyInboundTrust
 }
 
 Export-ModuleMember -Function *-TargetResource
-

Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,11 @@ function Get-TargetResource`
`101`	`101`	`$B2BCollaborationInboundValue = @{`
`102`	`102`	`Applications = @{`
`103`	`103`	`AccessType = $getValue.B2BCollaborationInbound.Applications.AccessType`
`104`		`- Targets = [System.String[]] $getValue.B2BCollaborationInbound.Applications.Targets`
	`104`	`+ Targets = [System.Array]$getValue.B2BCollaborationInbound.Applications.Targets`
`105`	`105`	`}`
`106`	`106`	`UsersAndGroups =@{`
`107`	`107`	`AccessType = $getValue.B2BCollaborationInbound.UsersAndGroups.AccessType`
`108`		`- Targets = [System.String[]] $getValue.B2BCollaborationInbound.UsersAndGroups.Targets`
	`108`	`+ Targets = [System.Array] $getValue.B2BCollaborationInbound.UsersAndGroups.Targets`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
`@@ -114,11 +114,11 @@ function Get-TargetResource`
`114`	`114`	`$B2BCollaborationOutboundValue = @{`
`115`	`115`	`Applications = @{`
`116`	`116`	`AccessType = $getValue.B2BCollaborationOutbound.Applications.AccessType`
`117`		`- Targets = [System.String[]] $getValue.B2BCollaborationOutbound.Applications.Targets`
	`117`	`+ Targets = [System.Array] $getValue.B2BCollaborationOutbound.Applications.Targets`
`118`	`118`	`}`
`119`	`119`	`UsersAndGroups =@{`
`120`	`120`	`AccessType = $getValue.B2BCollaborationOutbound.UsersAndGroups.AccessType`
`121`		`- Targets = [System.String[]] $getValue.B2BCollaborationOutbound.UsersAndGroups.Targets`
	`121`	`+ Targets = [System.Array] $getValue.B2BCollaborationOutbound.UsersAndGroups.Targets`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
`@@ -127,11 +127,11 @@ function Get-TargetResource`
`127`	`127`	`$B2BDirectConnectInboundValue = @{`
`128`	`128`	`Applications = @{`
`129`	`129`	`AccessType = $getValue.B2BDirectConnectInbound.Applications.AccessType`
`130`		`- Targets = [System.String[]] $getValue.B2BDirectConnectInbound.Applications.Targets`
	`130`	`+ Targets = [System.Array] $getValue.B2BDirectConnectInbound.Applications.Targets`
`131`	`131`	`}`
`132`	`132`	`UsersAndGroups =@{`
`133`	`133`	`AccessType = $getValue.B2BDirectConnectInbound.UsersAndGroups.AccessType`
`134`		`- Targets = [System.String[]] $getValue.B2BDirectConnectInbound.UsersAndGroups.Targets`
	`134`	`+ Targets = [System.Array] $getValue.B2BDirectConnectInbound.UsersAndGroups.Targets`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -140,11 +140,11 @@ function Get-TargetResource`
`140`	`140`	`$B2BDirectConnectOutboundValue = @{`
`141`	`141`	`Applications = @{`
`142`	`142`	`AccessType = $getValue.B2BDirectConnectOutbound.Applications.AccessType`
`143`		`- Targets = [System.String[]] $getValue.B2BDirectConnectOutbound.Applications.Targets`
	`143`	`+ Targets = [System.Array] $getValue.B2BDirectConnectOutbound.Applications.Targets`
`144`	`144`	`}`
`145`	`145`	`UsersAndGroups =@{`
`146`	`146`	`AccessType = $getValue.B2BDirectConnectOutbound.UsersAndGroups.AccessType`
`147`		`- Targets = [System.String[]] $getValue.B2BDirectConnectOutbound.UsersAndGroups.Targets`
	`147`	`+ Targets = [System.Array] $getValue.B2BDirectConnectOutbound.UsersAndGroups.Targets`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`}`
`@@ -837,4 +837,3 @@ function Get-M365DSCAADCrossTenantAccessPolicyInboundTrust`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`Export-ModuleMember -Function *-TargetResource`
`840`		`-`