Merge pull request #1027 from microsoft/Dev

Release 1.21.120.1
microsoft · Jan 20, 2021 · de0d643 · de0d643
2 parents b1dd0cb + 351b524
commit de0d643
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,18 @@
 # Change log for Microsoft365DSC
 
+# 1.21.120.1
+
+* DEPENDENCIES
+  * Updated MSCloudLoginAssistant to version 1.0.45;
+  * Replaced the SharePointPnPPowerShellOnline dependency by the new
+    PnP.PowerShell core module;
+
 # 1.21.113.1
 
+* AADTenantDetails
+  * Fixes an issue where the Set would fail if Service Principal
+   was used.
+   (Issue [#1002](https://github.com/microsoft/Microsoft365DSC/issues/1002))
 * AADRoleDefinition
   * Filters out role definitions without any assigned permissions.
     Fixes Issue #1007;

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1
@@ -168,9 +168,24 @@ function Set-TargetResource
 
 
     $currentParameters = $PSBoundParameters
-    $currentParameters
-    $currentParameters.Remove("GlobalAdminAccount") | Out-Null
-    $currentParameters.Remove("isSingleInstance") | Out-Null
+    $currentParameters.Remove("IsSingleInstance") | Out-Null
+
+    if ($currentParameters.ContainsKey("GlobalAdminAccount"))
+    {
+        $currentParameters.Remove("GlobalAdminAccount") | Out-Null
+    }
+    if ($currentParameters.ContainsKey("ApplicationId"))
+    {
+        $currentParameters.Remove("ApplicationId") | Out-Null
+    }
+    if ($currentParameters.ContainsKey("TenantId"))
+    {
+        $currentParameters.Remove("TenantId") | Out-Null
+    }
+    if ($currentParameters.ContainsKey("CertificateThumbprint"))
+    {
+        $currentParameters.Remove("CertificateThumbprint") | Out-Null
+    }
     try
     {
         Set-AzureADTenantDetail @currentParameters

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2021-01-14
+# Generated on: 2021-01-20
 
 @{
 
     # Script module or binary module file associated with this manifest.
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.21.113.1'
+    ModuleVersion     = '1.21.120.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -97,15 +97,15 @@
         },
         @{
             ModuleName      = "MSCloudLoginAssistant"
-            RequiredVersion = "1.0.42"
+            RequiredVersion = "1.0.45"
         },
         @{
-            ModuleName      = "ReverseDSC"
-            RequiredVersion = "2.0.0.7"
+            ModuleName      = "PnP.PowerShell"
+            RequiredVersion = "1.1.0"
         },
         @{
-            ModuleName      = "SharePointPnPPowerShellOnline"
-            RequiredVersion = "3.28.2012.0"
+            ModuleName      = "ReverseDSC"
+            RequiredVersion = "2.0.0.7"
         }
     )
 
@@ -180,12 +180,10 @@
             IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
             # ReleaseNotes of this module
-            ReleaseNotes = "* AADRoleDefinition
-            * Filters out role definitions without any assigned permissions.
-              Fixes Issue #1007;
-          * DEPENDENCIES
-            * Updated Microsoft.PowerApps.Administration.PowerShell
-              to 2.0.104;"
+            ReleaseNotes = "* DEPENDENCIES
+            * Updated MSCloudLoginAssistant to version 1.0.45;
+            * Replaced the SharePointPnPPowerShellOnline dependency by the new
+              PnP.PowerShell core module;"
 
             # Flag to indicate whether the module requires explicit user acceptance for install/update
             # RequireLicenseAcceptance = $false

diff --git a/README.md b/README.md
@@ -53,9 +53,9 @@ and be released to [PowerShell Gallery](https://www.powershellgallery.com/).
 
 ## How to Install
 
-In order to acquire the latest
+To acquire the latest
 bits of the module from a machine that has internet connectivity,
-simply run the following PowerShell line:
+run the following PowerShell line:
 
 ```powershell
 Install-Module -Name Microsoft365DSC -Force -AllowClobber
@@ -66,10 +66,10 @@ Install-Module -Name Microsoft365DSC -Force -AllowClobber
 Microsoft365DSC captures Telemetry data about the names of the resources
 in which a configuration drift has been detected, along with the type
 of exceptions being thrown by errors in the various modules. While no
-sensitive data is ever being captured, App Insights which is used for
-the analytics of the Telemetry, does capture information about the city
-where the telemetry entries where captured from by default. Users can
-opt out to prevent telemetry to be sent back to the Microsoft365DSC team
+sensitive data is ever captured, App Insights, which performs 
+telemetry analytics, captures information about the city
+where the telemetry entries were captured by default. Users can
+opt-out to prevent telemetry from being sent back to the Microsoft365DSC team
 by running the following command:
 
 ```powershell