Merge branch 'Dev' into dev2

microsoft · Oct 19, 2023 · dc1530f · dc1530f
2 parents e981431 + b6231fa
commit dc1530f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change log for Microsoft365DSC
 
-# UNRELEASED
+# 1.23.1018.1
 
 * AADAuthenticationMethodPolicyAuthenticator
   * Fixes an issue with the Get method when an assigned group
@@ -9,12 +9,16 @@
   * Added support for the SigninFrequencyInterval parameter.
 * EXODistributionGroup
   * Changes the export logic to use PrimarySMTPAddress if provided.
+* IntuneAntivirusPolicyWindows10SettingCatalog
+  * Added "-All" parameter to retrieve all settings from a template.
+  FIXES [#3722](https://github.com/microsoft/Microsoft365DSC/issues/3722)
 * IntuneDeviceCleanupRule
   * Initial release.
     FIXES [#3599](https://github.com/microsoft/Microsoft365DSC/issues/3599)
 * TeamsGroupPolicyAssignment
-  * Fixes the export of CsGroup, when the display name of a group is included in another display name.
-  Fix [#3736](https://github.com/microsoft/Microsoft365DSC/issues/3736)
+  * Fixes the export of CsGroup, when the display name of a group is included in
+    another display name.
+  FIXES [#3736](https://github.com/microsoft/Microsoft365DSC/issues/3736)
 * TeamsUserPolicyAssignment
   * Initial release.
   FIXES [#3777](https://github.com/microsoft/Microsoft365DSC/issues/3777)
@@ -51,7 +55,7 @@
     were not managed correctly.
     FIXES [#3639](https://github.com/microsoft/Microsoft365DSC/issues/3639)
 * AADEntitlementManagementConnectedOrganization
-  * Fixed [[#3738](https://github.com/microsoft/Microsoft365DSC/issues/3738)]
+  * FIXES [[#3738](https://github.com/microsoft/Microsoft365DSC/issues/3738)]
 * EXOCalendarProcessing
   * Initial release.
 * EXODistributionGroup

diff --git a/...virusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1 b/...virusPolicyWindows10SettingCatalog/MSFT_IntuneAntivirusPolicyWindows10SettingCatalog.psm1
@@ -1795,7 +1795,7 @@ function Format-M365DSCIntuneSettingCatalogPolicySettings
 
     $settings = @()
 
-    $templateSettings = Get-MgBetaDeviceManagementConfigurationPolicyTemplateSettingTemplate -DeviceManagementConfigurationPolicyTemplateId $templateReferenceId
+    $templateSettings = Get-MgBetaDeviceManagementConfigurationPolicyTemplateSettingTemplate -DeviceManagementConfigurationPolicyTemplateId $templateReferenceId -All
 
     #write-verbose -Message ( $DSCParams|out-string)
 

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2023-10-11
+# Generated on: 2023-10-18
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.23.1011.1'
+  ModuleVersion     = '1.23.1018.1'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -140,26 +140,25 @@
       IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
       # ReleaseNotes of this module
-      ReleaseNotes = '# 1.23.1011.1
-
-      * AADRoleEligibilityScheduleRequest
-  * Added support for groups assignment.
-    FIXES [#3744](https://github.com/microsoft/Microsoft365DSC/issues/3744)
-* EXOCalendarProcessing
-  * Added support for retrieved groups as calendar delegates.
-* EXODistributionGroup
-  * Fixes the export of group membership to use Identity.
-* TeamsUpdateManagementPolicy
-  * Add support for the new acceptable value for UseNewTeamsClient
-    (NewTeamsAsDefault).
-* MISC
-  * M365DSCReport: Also define property dataType, if present, as being primary
-     key on CIM instances.
-* TeamsUpgradeConfiguration
-  * Fixes an issue where the SfBMeetingJoinUx property wasn''t properly updated.
-* DEPENDENCIES
-  * Updated ExchangeOnlineManagement to version 3.4.0.
-  * Updated Microsoft.Graph dependencies to version 2.7.0.'
+      ReleaseNotes = '* AADAuthenticationMethodPolicyAuthenticator
+      * Fixes an issue with the Get method when an assigned group
+        was deleted.
+    * AADConditionalAccessPolicy
+      * Added support for the SigninFrequencyInterval parameter.
+    * EXODistributionGroup
+      * Changes the export logic to use PrimarySMTPAddress if provided.
+    * IntuneAntivirusPolicyWindows10SettingCatalog
+      * Added "-All" parameter to retrieve all settings from a template.
+      FIXES [#3722](https://github.com/microsoft/Microsoft365DSC/issues/3722)
+    * TeamsGroupPolicyAssignment
+      * Fixes the export of CsGroup, when the display name of a group is included in
+        another display name.
+      FIXES [#3736](https://github.com/microsoft/Microsoft365DSC/issues/3736)
+    * TeamsUserPolicyAssignment
+      * Initial release.
+      FIXES [#3777](https://github.com/microsoft/Microsoft365DSC/issues/3777)
+    * MISC
+      * Fixes fancy quotes in complex objects for extraction.'
 
       # Flag to indicate whether the module requires explicit user acceptance for install/update
       # RequireLicenseAcceptance = $false