Merge pull request #5628 from NikCharlebois/Release-1.25.115.1

Release 1.25.115.1
microsoft · Jan 15, 2025 · 0b3b7ff · 0b3b7ff
2 parents eefb68c + d3246e1
commit 0b3b7ff
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,21 @@
 # Change log for Microsoft365DSC
 
-# UNRELEASED
+# 1.25.115.1
 
 * AADAuthenticationRequirement
   * Filtered guests from the export, to prevent errors during export
     FIXES [#5625](https://github.com/microsoft/Microsoft365DSC/issues/5625)
+* AADCustomAuthenticationExtension
+  * Fixes an issue extracting instances due to the OrganizationName being null.
 * AADGroup
   * Only get Members & GroupAsMembers when a static group is defined.
 * AADGroupEligibilitySchedule
   * New resource for Privileged Identity Management (PIM) for Groups
+* AADNamingLocationPolicy
+  * Improved logging and fixed issue that caused creation of duplicate
+    locations with same name.
+* EXOSmtpDaneInbound
+  * Initial release
 * IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy
   * Fixed creation of policy while it was found by name, now it updates existing policies correctly.
 * IntuneAccountProtectionPolicyWindows10
@@ -37,15 +44,18 @@
   * Fixed creation of policy while it was found by name, now it updates existing policies correctly.
 * IntuneSettingCatalogASRRulesPolicyWindows10
   * Fixed creation of policy while it was found by name, now it updates existing policies correctly.
-* AADNamingLocationPolicy
-  * Improved logging and fixed issue that caused creation of duplicate
-    locations with same name.
-* EXOSmtpDaneInbound
-  * initial release
 * IntuneVPNConfigurationPolicyAndroidWork
   * Initial release
+* M365DSCRuleEvaluation
+  * Making RuleDefinition a key of the resource to allow multiple
+    rules for the same resource type to be provided in the same config.
+  * Adding a new RuleName parameter to make it easier to understand
+    the results in the event logs.
 * TeamsGroupPolicyAssignment
   * FIXES [[#5527](https://github.com/microsoft/Microsoft365DSC/issues/5527)]
+* DEPENDENCIES
+  * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.203.
+  * Updated MSCloudLoginAssistant to version 1.1.34.
 
 # 1.25.108.1
 

diff --git a/...esources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1 b/...esources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1
@@ -143,10 +143,17 @@ function Get-TargetResource
         Write-Verbose 'Instance found for the resource. Calculating result....'
 
         $results = @{
-            DisplayName = $instance.DisplayName
-            Id          = $instance.Id
-            Description = $instance.Description
-            Ensure      = 'Present'
+            DisplayName           = $instance.DisplayName
+            Id                    = $instance.Id
+            Description           = $instance.Description
+            Ensure                = 'Present'            
+            Credential            = $Credential
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            ApplicationSecret     = $ApplicationSecret
+            CertificateThumbprint = $CertificateThumbprint
+            ManagedIdentity       = $ManagedIdentity.IsPresent
+            AccessTokens          = $AccessTokens
         }
 
         if ($instance.AdditionalProperties -ne $null)

diff --git a/...T_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1 b/...T_AADIdentityGovernanceLifecycleWorkflow/MSFT_AADIdentityGovernanceLifecycleWorkflow.psm1
@@ -556,13 +556,22 @@ function Export-TargetResource
     }
     catch
     {
-        Write-Host $Global:M365DSCEmojiRedX
+        if ($_.ErrorDetails.Message -like "Insufficient license *")
+        {
+            Write-Host "`r`n    " -NoNewline
+            Write-Host $Global:M365DSCEmojiYellowCircle -NoNewline
+            Write-Host " Insufficient license. You need the Entra ID Governance license."
+        }
+        else
+        {
+            Write-Host $Global:M365DSCEmojiRedX
 
-        New-M365DSCLogEntry -Message 'Error during Export:' `
-            -Exception $_ `
-            -Source $($MyInvocation.MyCommand.Source) `
-            -TenantId $TenantId `
-            -Credential $Credential
+            New-M365DSCLogEntry -Message 'Error during Export:' `
+                -Exception $_ `
+                -Source $($MyInvocation.MyCommand.Source) `
+                -TenantId $TenantId `
+                -Credential $Credential
+        }
 
         return ''
     }

diff --git a/...owCustomTaskExtension/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension.psm1 b/...owCustomTaskExtension/MSFT_AADIdentityGovernanceLifecycleWorkflowCustomTaskExtension.psm1
@@ -588,13 +588,22 @@ function Export-TargetResource
     }
     catch
     {
-        Write-Host $Global:M365DSCEmojiRedX
+        if ($_.ErrorDetails.Message -like "Insufficient license *")
+        {
+            Write-Host "`r`n    " -NoNewline
+            Write-Host $Global:M365DSCEmojiYellowCircle -NoNewline
+            Write-Host " Insufficient license. You need the Entra ID Governance license."
+        }
+        else
+        {
+            Write-Host $Global:M365DSCEmojiRedX
 
-        New-M365DSCLogEntry -Message 'Error during Export:' `
-            -Exception $_ `
-            -Source $($MyInvocation.MyCommand.Source) `
-            -TenantId $TenantId `
-            -Credential $Credential
+            New-M365DSCLogEntry -Message 'Error during Export:' `
+                -Exception $_ `
+                -Source $($MyInvocation.MyCommand.Source) `
+                -TenantId $TenantId `
+                -Credential $Credential
+        }
 
         return ''
     }

diff --git a/...DSC/DSCResources/MSFT_AADLifecycleWorkflowSettings/MSFT_AADLifecycleWorkflowSettings.psm1 b/...DSC/DSCResources/MSFT_AADLifecycleWorkflowSettings/MSFT_AADLifecycleWorkflowSettings.psm1
@@ -367,13 +367,22 @@ function Export-TargetResource
     }
     catch
     {
-        Write-Host $Global:M365DSCEmojiRedX
+        if ($_.ErrorDetails.Message -like "Insufficient license *")
+        {
+            Write-Host "`r`n    " -NoNewline
+            Write-Host $Global:M365DSCEmojiYellowCircle -NoNewline
+            Write-Host " Insufficient license. You need the Entra ID Governance license."
+        }
+        else
+        {
+            Write-Host $Global:M365DSCEmojiRedX
 
-        New-M365DSCLogEntry -Message 'Error during Export:' `
-            -Exception $_ `
-            -Source $($MyInvocation.MyCommand.Source) `
-            -TenantId $TenantId `
-            -Credential $Credential
+            New-M365DSCLogEntry -Message 'Error during Export:' `
+                -Exception $_ `
+                -Source $($MyInvocation.MyCommand.Source) `
+                -TenantId $TenantId `
+                -Credential $Credential
+        }
 
         return ''
     }

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_M365DSCRuleEvaluation/MSFT_M365DSCRuleEvaluation.psm1 b/...s/Microsoft365DSC/DSCResources/MSFT_M365DSCRuleEvaluation/MSFT_M365DSCRuleEvaluation.psm1
@@ -12,6 +12,10 @@ function Get-TargetResource
         [System.String]
         $RuleDefinition,
 
+        [Parameter()]
+        [System.String]
+        $RuleName,
+
         [Parameter()]
         [System.String]
         $AfterRuleCountQuery,
@@ -60,6 +64,10 @@ function Set-TargetResource
         [System.String]
         $RuleDefinition,
 
+        [Parameter()]
+        [System.String]
+        $RuleName,
+
         [Parameter()]
         [System.String]
         $AfterRuleCountQuery,
@@ -109,6 +117,10 @@ function Test-TargetResource
         [System.String]
         $RuleDefinition,
 
+        [Parameter()]
+        [System.String]
+        $RuleName,
+
         [Parameter()]
         [System.String]
         $AfterRuleCountQuery,
@@ -223,6 +235,7 @@ function Test-TargetResource
 
         $message = [System.Text.StringBuilder]::New()
         [void]$message.AppendLine('<M365DSCRuleEvaluation>')
+        [void]$message.AppendLine("  <RuleName>$RuleName</RuleName>")
         [void]$message.AppendLine("  <ResourceName>$ResourceTypeName</ResourceName>")
         [void]$message.AppendLine("  <RuleDefinition>$RuleDefinition</RuleDefinition>")
 

diff --git a/...osoft365DSC/DSCResources/MSFT_M365DSCRuleEvaluation/MSFT_M365DSCRuleEvaluation.schema.mof b/...osoft365DSC/DSCResources/MSFT_M365DSCRuleEvaluation/MSFT_M365DSCRuleEvaluation.schema.mof
@@ -2,7 +2,8 @@
 class MSFT_M365DSCRuleEvaluation : OMI_BaseResource
 {
     [Key, Description("Name of the resource to monitor")] String ResourceTypeName;
-    [Required, Description("Specify the rules to monitor the resource for.")] String RuleDefinition;
+    [Key, Description("Specify the rules to monitor the resource for.")] String RuleDefinition;
+    [Write, Description("Custom display name for the rule. This will show up in the logs on drift detection.")] String RuleName;
     [Write, Description("Query to check how many instances exist, using PowerShell format")] String AfterRuleCountQuery;
     [Write, Description("Credentials of the Azure Active Directory Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;

diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1
@@ -114,15 +114,15 @@
         },
         @{
             ModuleName      = 'Microsoft.PowerApps.Administration.PowerShell'
-            RequiredVersion = '2.0.202'
+            RequiredVersion = '2.0.203'
         },
         @{
             ModuleName      = 'MicrosoftTeams'
             RequiredVersion = '6.7.0'
         },
         @{
             ModuleName      = "MSCloudLoginAssistant"
-            RequiredVersion = "1.1.31"
+            RequiredVersion = "1.1.34"
         },
         @{
             ModuleName      = 'PnP.PowerShell'