Merge pull request #849 from NikCharlebois/Cleanup

Cleanup
microsoft · Oct 21, 2020 · 3376249 · 3376249
2 parents 10a69cf + 54d1e29
commit 3376249
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 ## 1.20.1021.1
 
+* AADTenantDetails
+  * Fixed issue where IsSingleInstance was not returned from
+    the Get-TargetResource method;
 * MISC
+  * Fix to how Telemetry is retrieving module version;
   * Added additional error troubleshooting information
     to telemetry (dependencies version).
 

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1
@@ -72,10 +72,15 @@ function Get-TargetResource
         {
             Write-Verbose -Message "Found existing AzureAD Tenant Details"
             $result = @{
-                MarketingNotificationEmails             = $AADTenantDetails.MarketingNotificationEmails
-                SecurityComplianceNotificationMails     = $AADTenantDetails.SecurityComplianceNotificationMails
-                SecurityComplianceNotificationPhones    = $AADTenantDetails.SecurityComplianceNotificationPhones
-                TechnicalNotificationMails              = $AADTenantDetails.TechnicalNotificationMails
+                IsSingleInstance                     = 'Yes'
+                MarketingNotificationEmails          = $AADTenantDetails.MarketingNotificationEmails
+                SecurityComplianceNotificationMails  = $AADTenantDetails.SecurityComplianceNotificationMails
+                SecurityComplianceNotificationPhones = $AADTenantDetails.SecurityComplianceNotificationPhones
+                TechnicalNotificationMails           = $AADTenantDetails.TechnicalNotificationMails
+                GlobalAdminAccount                   = $GlobalAdminAccount
+                ApplicationId                        = $ApplicationId
+                TenantId                             = $TenantId
+                CertificateThumbprint                = $CertificateThumbprint
             }
             Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DSCHashTabletoString -Hashtable $result)"
             return $result

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1
@@ -117,8 +117,8 @@ function Add-M365DSCTelemetryEvent
                 }
             }
 
-            $version = (Get-Module 'Microsoft365DSC').Version
-            $Data.Add("M365DSCVersion", $version)
+            [array]$version = (Get-Module 'Microsoft365DSC').Version | Sort-Object -Descending
+            $Data.Add("M365DSCVersion", $version[0].ToString())
 
             # Get Dependencies loaded versions
             try