Merge pull request #3524 from NikCharlebois/Fixes-3499

Fixes #3499
microsoft · Jul 28, 2023 · cf8e027 · cf8e027
2 parents 3492987 + 70c0657
commit cf8e027
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,12 +7,18 @@
     FIXES [#3518](https://github.com/microsoft/Microsoft365DSC/issues/3518)
 * O365OrgSettings
   * Added error handling for the Viva settings to handle task cancellation errors.
+* SCComplianceSearch
+  * Fixed an issue with the export when using CertificateThumbprint.
+    FIXES [#3499](https://github.com/microsoft/Microsoft365DSC/issues/3499)
 * SCComplianceSearchAction
   * Adds support for the Preview action type.
     FIXES [#3498](https://github.com/microsoft/Microsoft365DSC/issues/3498)
 * MISC
   * M365DscReverse: Fix exporting when $Filter var exists locally
     FIXES [#3515](https://github.com/microsoft/Microsoft365DSC/issues/3515)
+* DEPENDENCIES
+  * Updated Microsoft.Graph.* dependencies to version 2.2.0.
+  * Updated dependency Microsoft.PowerApps.Administration.PowerShell to version 2.0.170.
 
 # 1.23.726.1
 

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1
@@ -553,9 +553,14 @@ function Export-TargetResource
             foreach ($search in $searches)
             {
                 $Params = @{
-                    Name       = $search.Name
-                    Case       = $case.Name
-                    Credential = $Credential
+                    Name                  = $search.Name
+                    Case                  = $case.Name
+                    Credential            = $Credential
+                    ApplicationId         = $ApplicationId
+                    TenantId              = $TenantId
+                    CertificateThumbprint = $CertificateThumbprint
+                    CertificatePath       = $CertificatePath
+                    CertificatePassword   = $CertificatePassword
                 }
                 Write-Host "        |---[$i/$($searches.Name.Count)] $($search.Name)" -NoNewline
                 $Results = Get-TargetResource @Params

diff --git a/Modules/Microsoft365DSC/Dependencies/Manifest.psd1 b/Modules/Microsoft365DSC/Dependencies/Manifest.psd1
@@ -10,71 +10,71 @@
         },
         @{
             ModuleName      = 'Microsoft.Graph.Applications'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Authentication'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Devices.CorporateManagement'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement.Administration'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement.Enrollment'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.DirectoryManagement'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.Governance'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.SignIns'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Teams'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.DeviceManagement.Administration'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DirectoryObjects'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Groups'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Planner'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users.Actions'
-            RequiredVersion = '2.1.0'
+            RequiredVersion = '2.2.0'
         },
         @{
             ModuleName      = 'Microsoft.PowerApps.Administration.PowerShell'
-            RequiredVersion = '2.0.168'
+            RequiredVersion = '2.0.170'
         },
         @{
             ModuleName      = 'MicrosoftTeams'