Merge branch 'Dev' into fix4814

microsoft · Jul 3, 2024 · a6113d2 · a6113d2
2 parents 7f3e8c7 + 9c05936
commit a6113d2
Show file tree

Hide file tree

Showing 29 changed files with 1,818 additions and 778 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,18 +5,25 @@
 * EXOCASMailboxPlan
   * Remove `DisplayName` from set parameters
     FIXES [#4814](https://github.com/microsoft/Microsoft365DSC/issues/4814)
+* EXODkimSigningConfig
+  * Add support for 2048 key size
+  FIXES [#4805](https://github.com/microsoft/Microsoft365DSC/issues/4805)
+* EXOGroupSettings
+ * Export unlimited number of groups
+ FIXES [#4800](https://github.com/microsoft/Microsoft365DSC/issues/4800)
+* IntuneExploitProtectionPolicyWindows10SettingCatalog
+  * Migrate to new settings catalog cmdlets.
+* M365DSCDRGUtil
+  * Force array as parameter in `Compare-M365DSCIntunePolicyAssignment`.
+* DEPENDENCIES
+  * Updated DSCParser to version 2.0.0.6
 
 # 1.24.626.1
 
 * AADGroup
   * FIXES [#4782](https://github.com/microsoft/Microsoft365DSC/issues/4782)
 * IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy
   * Migrate to new settings catalog cmdlets.
-* IntuneDeviceManagementComplianceSettings
-  * Initial Release.
-* IntuneDeviceRemediation
-  * Fix invalid assignment export and import.
-    FIXES [#4726](https://github.com/microsoft/Microsoft365DSC/issues/4726)
 * M365DSCDRGUtil
   * Fixes an issue with the settings catalog property generation.
   * Add `collectionId` export to `ConvertFrom-IntunePolicyAssignment`

diff --git a/...les/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 b/...les/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1
@@ -32,9 +32,9 @@ function Get-TargetResource
         $HeaderCanonicalization = 'Relaxed',
 
         [Parameter()]
-        [ValidateSet(1024)]
+        [ValidateSet(1024, 2048)]
         [uint16]
-        $KeySize = 1024,
+        $KeySize,
 
         [Parameter()]
         [System.Management.Automation.PSCredential]
@@ -126,7 +126,7 @@ function Get-TargetResource
             BodyCanonicalization   = $DkimSigningConfig.BodyCanonicalization
             Enabled                = $DkimSigningConfig.Enabled
             HeaderCanonicalization = $DkimSigningConfig.HeaderCanonicalization
-            KeySize                = 1024
+            KeySize                = $DkimSigningConfig.Selector1KeySize
             Credential             = $Credential
             ApplicationId          = $ApplicationId
             CertificateThumbprint  = $CertificateThumbprint
@@ -176,9 +176,9 @@ function Set-TargetResource
         $HeaderCanonicalization = 'Relaxed',
 
         [Parameter()]
-        [ValidateSet(1024)]
+        [ValidateSet(1024, 2048)]
         [uint16]
-        $KeySize = 1024,
+        $KeySize,
 
         [Parameter()]
         [System.Management.Automation.PSCredential]
@@ -304,9 +304,9 @@ function Test-TargetResource
         $HeaderCanonicalization = 'Relaxed',
 
         [Parameter()]
-        [ValidateSet(1024)]
+        [ValidateSet(1024, 2048)]
         [uint16]
-        $KeySize = 1024,
+        $KeySize,
 
         [Parameter()]
         [System.Management.Automation.PSCredential]

diff --git a/...crosoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.schema.mof b/...crosoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.schema.mof
@@ -5,7 +5,7 @@ class MSFT_EXODkimSigningConfig : OMI_BaseResource
     [Write, Description("The AdminDisplayName parameter specifies a description for the policy.")] String AdminDisplayName;
     [Write, Description("The BodyCanonicalization parameter specifies the canonicalization algorithm that's used to create and verify the message body part of the DKIM signature. This value effectively controls the sensitivity of DKIM to changes to the message body in transit. Valid values are 'Simple' or 'Relaxed'.  'Relaxed' is the default."), ValueMap{"Simple","Relaxed"}, Values{"Simple","Relaxed"}] String BodyCanonicalization;
     [Write, Description("The HeaderCanonicalization parameter specifies the canonicalization algorithm that's used to create and verify the message header part of the DKIM signature. This value effectively controls the sensitivity of DKIM to changes to the message headers in transit. Valid values are 'Simple' or 'Relaxed'.  'Relaxed' is the default."), ValueMap{"Simple","Relaxed"}, Values{"Simple","Relaxed"}] String HeaderCanonicalization;
-    [Write, Description("The KeySize parameter specifies the size in bits of the public key that's used in the DKIM signing policy. The only available value is 1024."),ValueMap{"1024"}, Values{"1024"}] Uint16 KeySize;
+    [Write, Description("The KeySize parameter specifies the size in bits of the public key that's used in the DKIM signing policy. Valid values are 1024 and 2048"),ValueMap{"1024","2048"}, Values{"1024","2048"}] Uint16 KeySize;
     [Write, Description("The Enabled parameter specifies whether the DKIM Signing Configuration is enabled or disabled. Default is $true.")] Boolean Enabled;
     [Write, Description("Specifies if this Client Access Rule should exist."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
     [Write, Description("Credentials of the Exchange Global Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;