Skip to content

Commit 8f78a67

Browse files
Merge pull request #6417 from NikCharlebois/Release-1.25.806.1
Release 1.25.806.1
2 parents 79b9383 + 2a31ccd commit 8f78a67

File tree

7 files changed

+65
-18
lines changed

7 files changed

+65
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Change log for Microsoft365DSC
22

3-
# UNRELEASED
3+
# 1.25.806.1
44

55
* AADApplication
66
* Fixed an issue where not all properties were exported.

Modules/Microsoft365DSC/DSCResources/MSFT_EXOFocusedInbox/MSFT_EXOFocusedInbox.psm1

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ function Get-TargetResource
6767
$nullResult.Ensure = 'Absent'
6868
try
6969
{
70-
$instance = Get-FocusedInbox -Identity $Identity -ErrorAction SilentlyContinue
70+
$mailbox = Get-Mailbox -Identity $Identity -ErrorAction SilentlyContinue
71+
if ($null -ne $mailbox)
72+
{
73+
$instance = Get-FocusedInbox -Identity $Identity
74+
}
75+
7176
if ($null -eq $instance)
7277
{
7378
return $nullResult
@@ -76,7 +81,8 @@ function Get-TargetResource
7681
$results = @{
7782
Identity = $Identity
7883
FocusedInboxOn = [Boolean]$instance.FocusedInboxOn
79-
FocusedInboxOnLastUpdateTime = [DateTime]$instance.FocusedInboxOnLastUpdateTime
84+
# DEPRECATED
85+
# FocusedInboxOnLastUpdateTime = [DateTime]$instance.FocusedInboxOnLastUpdateTime
8086
Ensure = 'Present'
8187
Credential = $Credential
8288
ApplicationId = $ApplicationId
@@ -228,6 +234,7 @@ function Test-TargetResource
228234

229235
$CurrentValues = Get-TargetResource @PSBoundParameters
230236
$ValuesToCheck = ([Hashtable]$PSBoundParameters).Clone()
237+
$ValuesToCheck.Remove('FocusedInboxOnLastUpdateTime') | Out-Null
231238

232239
Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)"
233240
Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)"
@@ -309,6 +316,11 @@ function Export-TargetResource
309316
}
310317
foreach ($config in $Script:exportedInstances)
311318
{
319+
if ($null -ne $Global:M365DSCExportResourceInstancesCount)
320+
{
321+
$Global:M365DSCExportResourceInstancesCount++
322+
}
323+
312324
$displayedKey = $config.UserPrincipalName
313325
Write-M365DSCHost -Message " |---[$i/$($Script:exportedInstances.Count)] $displayedKey" -DeferWrite
314326
$params = @{

Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxAuditBypassAssociation/MSFT_EXOMailboxAuditBypassAssociation.psm1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ function Get-TargetResource
6565
{
6666
# We need the Where-Object clause because calling the cmdlet by Identity only can retrieve similar
6767
# patterns.
68-
$instance = Get-MailboxAuditBypassAssociation -Identity $Identity.Replace("`r",'') -ErrorAction Stop |
69-
Where-Object -FilterScript {$_.Identity -eq $Identity.Replace("`r",'')}
70-
68+
$instance = Get-MailboxAuditBypassAssociation -Identity $Identity.Replace("`r",'') -ErrorAction SilentlyContinue
69+
$instance = $instance | Where-Object -FilterScript {$_.Identity -eq $Identity.Replace("`r",'')}
7170
}
7271
if ($null -eq $instance)
7372
{

Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxCalendarConfiguration/MSFT_EXOMailboxCalendarConfiguration.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function Get-TargetResource
227227
$nullResult.Ensure = 'Absent'
228228
try
229229
{
230-
$config = Get-MailboxCalendarConfiguration -Identity $Identity -ErrorAction Stop
230+
$config = Get-MailboxCalendarConfiguration -Identity $Identity -ErrorAction SilentlyContinue
231231

232232
if ($null -eq $config)
233233
{

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,6 @@ function Export-TargetResource
354354
ManagedIdentity = $ManagedIdentity.IsPresent
355355
AccessTokens = $AccessTokens
356356
}
357-
Add-ConfigurationDataEntry -Node 'NonNodeData' -Key 'SdnApiToken' -Value '**********'`
358-
-Description 'API Token for the Teams SDN Provider for Meeting Broadcast'
359357
$Results = Get-TargetResource @Params
360358
if ($Results -is [System.Collections.Hashtable] -and $Results.Count -gt 1)
361359
{
@@ -364,7 +362,7 @@ function Export-TargetResource
364362
$Global:M365DSCExportResourceInstancesCount++
365363
}
366364

367-
$results.SdnApiToken = '$ConfigurationData.Settings.SdnApiToken'
365+
$results.SdnApiToken = '**********'
368366

369367
$currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName `
370368
-ConnectionMode $ConnectionMode `
@@ -401,4 +399,3 @@ function Export-TargetResource
401399
}
402400

403401
Export-ModuleMember -Function *-TargetResource
404-

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/settings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
}
3131
},
3232
"requiredModules": [
33-
"MicrosoftTeams",
34-
"ReverseDSC"
33+
"MicrosoftTeams"
3534
]
3635
}

Modules/Microsoft365DSC/Microsoft365DSC.psd1

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 2025-07-30
6+
# Generated on: 2025-08-08
77

88
@{
99

1010
# Script module or binary module file associated with this manifest.
1111
# RootModule = ''
1212

1313
# Version number of this module.
14-
ModuleVersion = '1.25.730.1'
14+
ModuleVersion = '1.25.806.1'
1515

1616
# Supported PSEditions
1717
# CompatiblePSEditions = @()
@@ -151,9 +151,49 @@
151151
IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
152152

153153
# ReleaseNotes of this module
154-
ReleaseNotes = '* AADServicePrincipal
155-
* Fixed an issue when translating `AppId` to the corresponding `DisplayName` during test.
156-
FIXES [#6382](https://github.com/microsoft/Microsoft365DSC/issues/6382)'
154+
ReleaseNotes = '* AADApplication
155+
* Fixed an issue where not all properties were exported.
156+
* AADAuthenticationMethodPolicyFido2
157+
* Fixed an issue where the policy was not updated properly.
158+
FIXES [#6391](https://github.com/microsoft/Microsoft365DSC/issues/6391)
159+
* AADCrossTenantAccessPolicyConfigurationDefault
160+
* Fixed an issue where the export returns an invalid value for `Targets`.
161+
FIXES [#6397](https://github.com/microsoft/Microsoft365DSC/issues/6397)
162+
* AADEntitlementManagementAccessPackage
163+
* Fixed an issue where `AccessPackagesIncompatibleWith` would not be populated with a value.
164+
FIXES [#5063](https://github.com/microsoft/Microsoft365DSC/issues/5063)
165+
* AADServicePrincipal
166+
* Fixes for retrieving instance by name.
167+
* AADUser
168+
* Added support for Mail attribute.
169+
* EXOOrganizationConfig
170+
* Added support for the RejectDirectSend property.
171+
* FabricAdminTenantSettings
172+
* Fixed the export of the resource.
173+
FIXES [#6345](https://github.com/microsoft/Microsoft365DSC/issues/6345)
174+
* IntuneMobileAppsLobAppiOS
175+
* Initial release.
176+
* IntuneMobileAppsLobAppAndroid
177+
* Initial release.
178+
* IntuneMobileAppsLobAppWindows10
179+
* Initial release.
180+
* IntuneMobileAppsLobAppMsiWindows10
181+
* Initial release.
182+
* IntuneMobileAppsWin32AppWindows10
183+
* Updated the property name of `autoUpdateSupersededApps` to `autoUpdateSupersededAppsState`.
184+
* SCAutoSensitivityLabelRule
185+
* Updated supported values for `Workload` property.
186+
FIXES [#4617](https://github.com/microsoft/Microsoft365DSC/issues/4617)
187+
* SCSensitivityLabel
188+
* Reduced export time by 90%
189+
* TeamsEventsPolicy
190+
* Added 7 new properties.
191+
FIXES [#6403](https://github.com/microsoft/Microsoft365DSC/issues/6403)
192+
* M365DSCResourceGenerator
193+
* Fixed an issue where duplicate parameters would lead to an error during generation.
194+
FIXES [#5489](https://github.com/microsoft/Microsoft365DSC/issues/5489)
195+
* DEPENDENCIES
196+
* Updated ReverseDSC to version 2.0.0.29.'
157197

158198
# Flag to indicate whether the module requires explicit user acceptance for install/update
159199
# RequireLicenseAcceptance = $false

0 commit comments

Comments
 (0)