Skip to content

Commit

Permalink
Merge pull request #4902 from NikCharlebois/Tests-Improvements
Browse files Browse the repository at this point in the history
Release 1.24.717.1
  • Loading branch information
NikCharlebois authored Jul 17, 2024
2 parents 8079745 + 5931768 commit 0fb962b
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 26 deletions.
8 changes: 5 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Change log for Microsoft365DSC

# UNRELEASED
# 1.24.717.1

* AADConditionalAccessPolicy
* Made failures write to the error output instead of just verbose.
Expand All @@ -17,13 +17,13 @@
* Initial Release
FIXES [#4050](https://github.com/microsoft/Microsoft365DSC/issues/4050)
* IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10
* Initial release.
* Initial release.
FIXES [#2659](https://github.com/microsoft/Microsoft365DSC/issues/2659)
* SPOSharingSettings
* Improved performance by using -Filter on Get-PnPTenantSite calls.
* M365DSCDRGUtil
* Fixes an issue with nested and duplicate settings in the settings catalog
* Add support for converting Intune assignments directly from Graph.
* Add support for converting Intune assignments directly from Graph.
FIXES [#4875](https://github.com/microsoft/Microsoft365DSC/issues/4875)
* M365DSCResourceGenerator
* Update Intune resource generation.
Expand All @@ -33,6 +33,8 @@
FIXES [#4505](https://github.com/microsoft/Microsoft365DSC/issues/4505)
* Fixes an issue where the comparison treats empty arrays as an empty string.
FIXES [#4796](https://github.com/microsoft/Microsoft365DSC/issues/4796)
* Telemetry
* Added info about operation total execution time.

# 1.24.710.3

Expand Down
55 changes: 32 additions & 23 deletions Modules/Microsoft365DSC/Microsoft365DSC.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 2024-07-11
# Generated on: 2024-07-17

@{

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

# Version number of this module.
ModuleVersion = '1.24.710.3'
ModuleVersion = '1.24.717.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -142,28 +142,37 @@
IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'

# ReleaseNotes of this module
ReleaseNotes = '* AADApplication
* Fixes an error where the duplicate error was being trapped,
which could cause extra instances to be created.
* AADGroup
* Fixes an error where the duplicate error was being trapped,
which could cause extra instances to be created.
* IntuneDeviceConfigurationPlatformScriptMacOS
* Fixes an issue where the assignments are missing if filtered by display name.
ReleaseNotes = '* EXOHostedOutboundSpamFilterPolicy
* Changed the RecipientLimitInternalPerHour, RecipientLimitPerDay, and
RecipientLimitExternalPerHour parameters to UInt32.
* EXOMessageClassification
* Fix issue while creating policy for first time
FIXES [#4877](https://github.com/microsoft/Microsoft365DSC/issues/4877)
* IntuneDeviceConfigurationEmailProfilePolicyWindows10
* Fix export by fixing some typos and from where values are extracted
FIXES [#3960](https://github.com/microsoft/Microsoft365DSC/issues/3960)
* IntuneDiskEncryptionWindows10
* Initial Release
FIXES [#4050](https://github.com/microsoft/Microsoft365DSC/issues/4050)
* IntuneWindowsUpdateForBusinessQualityUpdateProfileWindows10
* Initial release.
FIXES [#2659](https://github.com/microsoft/Microsoft365DSC/issues/2659)
* SPOSharingSettings
* Improved performance by using -Filter on Get-PnPTenantSite calls.
* M365DSCDRGUtil
* Fixes an issue where the return value was changed to a single object
instead of an array.
FIXES [#4844](https://github.com/microsoft/Microsoft365DSC/issues/4844)
* Fixes an issue where Graph models were not treated properly as a complex object.
* TELEMETRY
* Added instance count.
* Added roles scopes info.
* DEPENDENCIES
* Updated DSCParser to version 2.0.0.7.
* Updated Microsoft.Graph to version 2.20.0
* Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.191
* MISC
* Fixes issue with App Secret Authentication flow.'
* Fixes an issue with nested and duplicate settings in the settings catalog
* Add support for converting Intune assignments directly from Graph.
FIXES [#4875](https://github.com/microsoft/Microsoft365DSC/issues/4875)
* M365DSCResourceGenerator
* Update Intune resource generation.
* M365DSCReport
* Changes behaviour to not throw on empty configuration during report generation.
FIXES [#4559](https://github.com/microsoft/Microsoft365DSC/issues/4559)
FIXES [#4505](https://github.com/microsoft/Microsoft365DSC/issues/4505)
* Fixes an issue where the comparison treats empty arrays as an empty string.
FIXES [#4796](https://github.com/microsoft/Microsoft365DSC/issues/4796)
* Telemetry
* Added info about operation total execution time.'

# Flag to indicate whether the module requires explicit user acceptance for install/update
# RequireLicenseAcceptance = $false
Expand Down
7 changes: 7 additions & 0 deletions Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,20 @@ function Add-M365DSCTelemetryEvent
{
$Script:M365DSCCountResourceInstance++
}
if ($null -eq $Script:M365DSCOperationStartTime -or $hostId -ne $Script:M365DSCExecutionContextId)
{
$Script:M365DSCOperationStartTime = [System.DateTime]::Now
}

$Script:M365DSCOperationTimeTaken = [System.DateTime]::Now.Subtract($Script:M365DSCOperationStartTime)

if ($hostId -ne $Script:M365DSCExecutionContextId)
{
$Script:M365DSCExecutionContextId = $hostId
}
$Data.Add('ResourceInstancesCount', $Script:M365DSCCountResourceInstance)
$Data.Add('M365DSCExecutionContextId', $hostId)
$Data.Add('M365DSCOperationTotalTime', $Script:M365DSCOperationTimeTaken.TotalSeconds)
}
catch
{
Expand Down

0 comments on commit 0fb962b

Please sign in to comment.